Move CoreCLR to the modern build tools and dnx

This changes moves coreclr onto DNX (same version as corefx).  Theoretically, this should allow these tests to target the desktop CLR.  All of the old package.config files are gone and replaced with corresponding project.json files.  The up front restore behavior is retained.  Tests are now buildable individually, though not runnable in a similar fashion.

diff --git a/build.cmd b/build.cmd
index c72db96..0a3f641 100644 (file)
--- a/build.cmd
+++ b/build.cmd
@@ -51,7 +51,6 @@ echo.
 set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%"
 set "__IntermediatesDir=%__RootBinDir%\obj\%__BuildOS%.%__BuildArch%.%__BuildType%"
 set "__PackagesBinDir=%__BinDir%\.nuget"
-set "__ToolsDir=%__RootBinDir%\tools"
 set "__TestBinDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildType%"
 set "__TestIntermediatesDir=%__RootBinDir%\tests\obj\%__BuildOS%.%__BuildArch%.%__BuildType%"
 
@@ -183,7 +182,7 @@ call "!VS%__VSProductVersion%COMNTOOLS!\VsDevCmd.bat"
 echo Commencing build of mscorlib for %__BuildOS%.%__BuildArch%.%__BuildType%
 echo.
 set "__MScorlibBuildLog=%__LogsDir%\MScorlib_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
-%_msbuildexe% "%__ProjectFilesDir%\build.proj" %__MSBCleanBuildArgs% /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%__MScorlibBuildLog%" /p:OS=%__BuildOS% %__AdditionalMSBuildArgs%
+%_msbuildexe% "%__ProjectFilesDir%\build.proj" %__MSBCleanBuildArgs% /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%__MScorlibBuildLog%" /p:OSGroup=%__BuildOS% %__AdditionalMSBuildArgs%
 IF NOT ERRORLEVEL 1 (
   if defined __MscorlibOnly exit /b 0
   goto CrossGenMscorlib
@@ -208,7 +207,7 @@ exit /b 1
 echo.
 echo Commencing build of tests for %__BuildOS%.%__BuildArch%.%__BuildType%
 echo.
-call tests\buildtest.cmd
+call %__ProjectDir%\tests\buildtest.cmd
 IF NOT ERRORLEVEL 1 goto SuccessfulBuild
 echo Test binaries build failed. Refer !__MScorlibBuildLog! for details.
 exit /b 1

diff --git a/dir.props b/dir.props
index d44e11d..5fc9429 100644 (file)
--- a/dir.props
+++ b/dir.props
@@ -1,4 +1,26 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+    $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
+  -->
+  <PropertyGroup>
+    <OsEnvironment Condition="'$(OsEnvironment)'==''">$(OS)</OsEnvironment>
+  </PropertyGroup>
+  
+  <!-- Build Tools Versions -->
+  <PropertyGroup>
+    <BuildToolsVersion>1.0.25-prerelease-00056</BuildToolsVersion>
+    <BuildToolsCoreCLRVersion>1.0.2-prerelease</BuildToolsCoreCLRVersion>
+    <DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-beta5-12101</DnxVersion>
+    <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta5-12101</DnxVersion>
+    <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'!='Unix'">dnx-coreclr-win-x86.$(DnxVersion)</DnxPackageName>
+    <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'=='Unix'">dnx-mono.$(DnxVersion)</DnxPackageName>
+    <RoslynVersion>1.0.0-rc3-20150510-01</RoslynVersion>
+    <RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName>
+    <BuildToolsCoreCLRPackageName>Microsoft.DotNet.BuildTools.CoreCLR</BuildToolsCoreCLRPackageName>
+    <BuildToolsCoreCLRLocation>$(ToolsDir)$(BuildToolsCoreCLRPackageName).$(BuildToolsCoreCLRVersion)</BuildToolsCoreCLRLocation>
+  </PropertyGroup>
+  
   <!-- Common properties -->
   <PropertyGroup>
     <!-- Set basic properties and normalize -->
@@ -15,33 +37,67 @@
     <BuildOS Condition="'$(__BuildOS)' == ''">Windows_NT</BuildOS>
 
     <ProjectDir>$(__ProjectDir)\</ProjectDir>
-    <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)\</ProjectDir>
+    <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)</ProjectDir>
 
     <SourceDir>$(__SourceDir)\</SourceDir>
-    <SourceDir Condition="'$(__SourceDir)'==''">$(ProjectDir)\src\</SourceDir>
+    <SourceDir Condition="'$(__SourceDir)'==''">$(ProjectDir)src\</SourceDir>
 
-    <PackagesGlobalConfig>$(SourceDir).nuget\packages.config</PackagesGlobalConfig>
     <PackagesDir>$(__PackagesDir)\</PackagesDir>
-    <PackagesDir Condition="'$(__PackagesDir)'==''">$(ProjectDir)\packages\</PackagesDir>
+    <PackagesDir Condition="'$(__PackagesDir)'==''">$(ProjectDir)packages\</PackagesDir>
 
     <RootBinDir>$(__RootBinDir)\</RootBinDir>
-    <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)\bin\</RootBinDir>
+    <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 
     <BinDir>$(__BinDir)\</BinDir>
-    <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)\Product\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir>
+    <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir>
 
     <!-- We don't append back slash because this path is used by nuget.exe as output directory and it
          fails to write packages to it if the path contains the forward slash.
     -->
     <PackagesBinDir>$(__PackagesBinDir)</PackagesBinDir>
-    <PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir)\.nuget</PackagesBinDir>
-
-    <ToolsDir>$(__ToolsDir)\</ToolsDir>
-    <ToolsDir Condition="'$(__ToolsDir)'==''">$(RootBinDir)\tools\</ToolsDir>
-
+    <PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget</PackagesBinDir>
+    
+    <ToolsDir Condition="'$(ToolsDir)'==''">$(PackagesDir)Microsoft.DotNet.BuildTools.$(BuildToolsVersion)/lib/</ToolsDir>
+    <!-- Directory for the CoreCLR tools (BCLRewriter, etc.) -->
+    <CoreCLRToolsDir>$(PackagesDir)Microsoft.DotNet.BuildTools.CoreCLR.$(BuildToolsCoreCLRVersion)/</CoreCLRToolsDir>
+    
     <TestWorkingDir>$(__TestWorkingDir)\</TestWorkingDir>
-    <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)\tests\$(BuildOS).$(BuildArch).$(BuildType)\</TestWorkingDir>
+    <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(BuildOS).$(BuildArch).$(BuildType)\</TestWorkingDir>
+  </PropertyGroup>
+  
+  <!-- Common nuget properties -->
+  <PropertyGroup>
+    <NuGetToolPath Condition="'$(NuGetToolPath)'==''">$(PackagesDir)NuGet.exe</NuGetToolPath>
+    <NuGetConfigFile Condition="'$(NuGetConfigFile)'==''">$(SourceDir)NuGet.Config</NuGetConfigFile>
+    <NuGetConfigCommandLine>-ConfigFile "$(NuGetConfigFile)"</NuGetConfigCommandLine>
+
+    <NugetRestoreCommand>"$(NuGetToolPath)"</NugetRestoreCommand>
+    <NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand>
+    <!-- Trim off the last slash so that nuget doesn't get confused and say there are illegal characters on
+         the path. -->
+    <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand>
+    <NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand>
+    <NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand>
+    <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <DnxPackageDir Condition="'$(DnxPackageDir)'==''">$(PackagesDir)/$(DnxPackageName)/</DnxPackageDir>
+    <DnuToolPath Condition="'$(DnuToolPath)'=='' and '$(OsEnvironment)'!='Unix'">$(DnxPackageDir)\bin\dnu.cmd</DnuToolPath>
+    <DnuToolPath Condition="'$(DnuToolPath)'=='' and '$(OsEnvironment)'=='Unix'">$(DnxPackageDir)/bin/dnu</DnuToolPath>
+
+    <DnuRestoreCommand>"$(DnuToolPath)"</DnuRestoreCommand>
+    <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand>
+    <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand>
+    <DnuRestoreCommand Condition="'$(LockDependencies)' == 'true'">$(DnuRestoreCommand) --lock</DnuRestoreCommand>
   </PropertyGroup>
+  
+  <!-- Common build tool properties -->
+  <!-- <PropertyGroup>
+    <BuildToolsCoreCLRPackageName>Microsoft.DotNet.BuildTools.CoreCLR</BuildToolsCoreCLRPackageName>
+    <BuildToolsCoreCLRVersion>1.0.2-prerelease</BuildToolsCoreCLRVersion>
+    <BuildToolsCoreCLRLocation>$(ToolsDir)$(BuildToolsCoreCLRPackageName).$(BuildToolsCoreCLRVersion)</BuildToolsCoreCLRLocation>
+  </PropertyGroup> -->
 
   <!-- Setup Nuget properties -->
   <ItemGroup>
@@ -65,29 +121,4 @@
     
     <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsOSX)' == 'true'">true</TargetsUnix>
   </PropertyGroup>
-  
-  <!-- Common NuGet properties -->
-  <PropertyGroup>
-    <NuGetToolPath>$(ToolsDir)NuGet.exe</NuGetToolPath>
-    <NuGetConfigFile>$(SourceDir)NuGet.Config</NuGetConfigFile>
-    <NuGetConfigCommandLine
-      Condition="Exists('$(NuGetConfigFile)')">-ConfigFile &quot;$(NuGetConfigFile)&quot;</NuGetConfigCommandLine>
-  </PropertyGroup>
-
-  <!-- Common build tool properties -->
-  <PropertyGroup>
-
-    <BuildToolsCoreCLRPackageName>Microsoft.DotNet.BuildTools.CoreCLR</BuildToolsCoreCLRPackageName>
-    <BuildToolsCoreCLRVersion>1.0.2-prerelease</BuildToolsCoreCLRVersion>
-    <BuildToolsCoreCLRInstallSempahore>$(ToolsDir)BuildTools.$(BuildToolsCoreCLRVersion).installed.semaphore</BuildToolsCoreCLRInstallSempahore>
-
-    <BuildToolsPackageName>Microsoft.DotNet.BuildTools</BuildToolsPackageName>
-    <BuildToolsVersion>1.0.25-prerelease-00009</BuildToolsVersion>
-
-    <BuildToolsCoreCLRTargetInputs>$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)build.proj</BuildToolsCoreCLRTargetInputs>
-    <BuildToolsCoreCLRTargetOutputs>$(BuildToolsCoreCLRInstallSempahore)</BuildToolsCoreCLRTargetOutputs>
-
-    <BuildToolsCoreCLRLocation>$(ToolsDir)\$(BuildToolsCoreCLRPackageName).$(BuildToolsCoreCLRVersion)</BuildToolsCoreCLRLocation>
-    <BuildToolsLocation>$(ToolsDir)\$(BuildToolsPackageName).$(BuildToolsVersion)</BuildToolsLocation>
-  </PropertyGroup>
 </Project>
\ No newline at end of file

diff --git a/dir.targets b/dir.targets
index 043e84f..fd2dcd3 100644 (file)
--- a/dir.targets
+++ b/dir.targets
@@ -1,43 +1,123 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" InitialTargets="_RestoreBuildToolsWrapper" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
   <!-- Inline task to bootstrap the build to enable downloading nuget.exe -->
   <UsingTask TaskName="DownloadFile" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll">
     <ParameterGroup>
-      <Address ParameterType="System.String" Required="true"/>
+      <Address ParameterType="System.String" Required="true" />
       <FileName ParameterType="System.String" Required="true" />
     </ParameterGroup>
     <Task>
       <Reference Include="System" />
+      <Reference Include="System.IO" />
       <Code Type="Fragment" Language="cs">
         <![CDATA[
-           var directory = System.IO.Path.GetDirectoryName(FileName);
-           System.IO.Directory.CreateDirectory(directory);
-           var client = new System.Net.WebClient();
-           client.Proxy = System.Net.WebRequest.DefaultWebProxy;
-           client.Proxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
-           client.DownloadFile(Address, FileName);
+            var directory = System.IO.Path.GetDirectoryName(FileName);
+            Directory.CreateDirectory(directory);
+
+            var tempFile = Path.Combine(directory, Path.GetRandomFileName());
+            var client = new System.Net.WebClient();
+            client.Proxy = System.Net.WebRequest.DefaultWebProxy;
+            if (client.Proxy != null) client.Proxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
+            var tryCount = 1;
+            var maxTries = 3;
+
+            while (tryCount <= maxTries)
+            {
+                try
+                {
+                    Log.LogMessage("Attempting to download {0}...", Address);
+                    client.DownloadFile(Address, tempFile);
+                    break;
+                }
+                catch (System.Net.WebException e)
+                {
+                    tryCount++;
+                    if (tryCount > maxTries)
+                    {
+                        throw;
+                    }
+                    else
+                    {
+                        Log.LogMessage(MessageImportance.High, "Download failed, retrying: {0}", e.Message);
+                    }
+                }
+            }
+
+            try
+            {
+                if (!File.Exists(FileName))
+                    File.Move(tempFile, FileName);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                    File.Delete(tempFile);
+            }
         ]]>
       </Code>
     </Task>
   </UsingTask>
 
+  <!--
+    Needed to avoid the IntialTargets from having an Output which ends up getting
+    added to the output references when you have a project to project reference.
+  -->
+  <Target Name="_RestoreBuildToolsWrapper" DependsOnTargets="_RestoreBuildTools" />
+
   <Target Name="_RestoreBuildTools"
-    BeforeTargets="Build"
-    Inputs="$(BuildToolsCoreCLRTargetInputs)"
-    Outputs="$(BuildToolsCoreCLRTargetOutputs)"
-    >
+          Inputs="$(MSBuildThisFileDirectory)dir.props;$(SourceDir).nuget/packages.$(OsEnvironment).config"
+          Outputs="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath);$(DnuToolPath)">
+    <Message Importance="High" Text="Restoring build tools..." />
+
+    <Copy Condition="Exists('$(NuGetCachedPath)')" SourceFiles="$(NuGetCachedPath)" DestinationFiles="$(NuGetToolPath)" SkipUnchangedFiles="true" />
 
     <!-- Download latest nuget.exe -->
-    <DownloadFile
-      Condition="!Exists($(NuGetToolPath))"
-      Address="https://nuget.org/nuget.exe"
-      FileName="$(NuGetToolPath)" />
+    <DownloadFile FileName="$(NuGetToolPath)"
+                  Address="https://www.nuget.org/nuget.exe"
+                  Condition="!Exists('$(NuGetToolPath)') and '$(OsEnvironment)'=='Windows_NT'" />
+
+    <Exec Command="curl -sSL --create-dirs -o $(NuGetToolPath) https://api.nuget.org/downloads/nuget.exe"
+          Condition="!Exists('$(NuGetToolPath)') and '$(OsEnvironment)'=='Unix'" />
+
+    <PropertyGroup>
+      <_RestoreBuildToolsCommand>$(NugetRestoreCommand) "$(SourceDir).nuget/packages.$(OsEnvironment).config"</_RestoreBuildToolsCommand>
+    </PropertyGroup>
 
     <!-- Restore build tools -->
-    <Exec
-      StandardOutputImportance="Low"
-      Command="&quot;$(NuGetToolPath)&quot; install &quot;$(PackagesGlobalConfig)&quot;  -o &quot;$(ToolsDir.Trim('\'))&quot; $(NuGetConfigCommandLine)" />
+    <Exec Command="$(_RestoreBuildToolsCommand)" StandardOutputImportance="Low" />
+
+    <!-- currently DNU doesn't support -ConfigFile: https://github.com/aspnet/dnx/issues/1693
+         Our DnuRestoreCommand doesn't force a config file  and we rely on the
+         directory probing for it to find nuget.config.  This works for restore from source,
+         but not restore from PackagesDir as happens for test project restore since PackagesDir
+         will not be under src.  To workaround, copy our nuget.config to packages. -->
+    <Copy Condition="Exists('$(NuGetConfigFile)')" SourceFiles="$(NuGetConfigFile)" DestinationFolder="$(PackagesDir)" SkipUnchangedFiles="true" />
+    <!-- Add this back if above comment becomes a problem -->
+    <!-- <Copy Condition="Exists('$(NuGetConfigFile)')" SourceFiles="$(NuGetConfigFile)" DestinationFolder="$(IntermediateOutputRootPath)" SkipUnchangedFiles="true" /> -->
+
+    <!-- Add DNU and Roslyn tool execute rights -->
+    <Exec Condition="'$(OsEnvironment)'=='Unix'"
+          Command="chmod a+x &quot;$(DnxPackageDir)/bin/dnu&quot;" />
+    <Exec Condition="'$(OsEnvironment)'=='Unix'"
+          Command="chmod a+x &quot;$(DnxPackageDir)/bin/dnx&quot;" />
+    <Exec Condition="'$(OsEnvironment)'=='Unix'"
+          Command="find '$(RoslynPackageDir)tools' -name &quot;*.exe&quot; -exec chmod &quot;+x&quot; '{}' ';'" />
 
-    <Touch Files="$(BuildToolsInstallSemaphore)" AlwaysCreate="true" />
+    <Error Condition="'$(ErrorIfBuildToolsRestoredFromIndividualProject)'=='true'"
+           Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." />
+
+    <!--
+      There are cases where the inputs could be newer than the outputs but the
+      download or restore may not need to update. In such cases we need to touch
+      these files otherwise we continually run this target over and over for
+      every project until these files are cleaned (if the are ever cleaned).
+    -->
+    <Touch Files="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath);$(DnuToolPath)" />
   </Target>
-</Project>
\ No newline at end of file
+
+  <!-- Provide default empty targets for BuildAndTest and Test which can be hooked onto or overridden as necessary -->
+  <Target Name="BuildAndTest" DependsOnTargets="Build;Test" />
+
+  <Target Name="Test" />
+</Project>

diff --git a/src/.nuget/packages.config b/src/.nuget/packages.Unix.config
similarity index 67%
rename from src/.nuget/packages.config
rename to src/.nuget/packages.Unix.config
index 0b218b8..b7a7e0b 100644 (file)
--- a/src/.nuget/packages.config
+++ b/src/.nuget/packages.Unix.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.DotNet.BuildTools.CoreCLR" version="1.0.2-prerelease" />
-  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00009" />
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00056" />
+  <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />
 </packages>
\ No newline at end of file

diff --git a/src/.nuget/packages.Windows_NT.config b/src/.nuget/packages.Windows_NT.config
new file mode 100644 (file)
index 0000000..872e60d
--- /dev/null
+++ b/src/.nuget/packages.Windows_NT.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00056" />
+  <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />
+  <package id="Microsoft.DotNet.BuildTools.CoreCLR" version="1.0.2-prerelease" />
+</packages>
\ No newline at end of file

diff --git a/NuGet.Config b/src/NuGet.Config
similarity index 100%
rename from NuGet.Config
rename to src/NuGet.Config

diff --git a/src/mscorlib/Tools/BclRewriter/BclRewriter.targets b/src/mscorlib/Tools/BclRewriter/BclRewriter.targets
index d64414f..837f14f 100644 (file)
--- a/src/mscorlib/Tools/BclRewriter/BclRewriter.targets
+++ b/src/mscorlib/Tools/BclRewriter/BclRewriter.targets
@@ -5,7 +5,7 @@
   <!-- ********************************************************************************************* -->
 
   <PropertyGroup>
-    <BclRewriterCommand Condition="'$(BclRewriterCommand)'==''">$(BuildToolsCoreCLRLocation)\BclRewriter.exe</BclRewriterCommand>
+    <BclRewriterCommand Condition="'$(BclRewriterCommand)'==''">$(CoreCLRToolsDir)\BclRewriter.exe</BclRewriterCommand>
     <BclRewriterModelFile>$(MscorlibDir)model.xml</BclRewriterModelFile>
     <BclRewriterWorkDir>$(IntermediateOutputPath)\BclRewriter</BclRewriterWorkDir>
     <BclRewriterSymbolOutput>$(IntermediateOutputPath)\BclRewriter\$(TargetName).pdb</BclRewriterSymbolOutput>

diff --git a/tests/build.proj b/tests/build.proj
index 9064f3c..6d4c350 100644 (file)
--- a/tests/build.proj
+++ b/tests/build.proj
@@ -2,53 +2,29 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="dir.props" />
 
-  <!-- Inline task to bootstrap the build to enable downloading nuget.exe -->
-  <UsingTask TaskName="DownloadFile" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll">
-    <ParameterGroup>
-      <Address ParameterType="System.String" Required="true"/>
-      <FileName ParameterType="System.String" Required="true" />
-    </ParameterGroup>
-    <Task>
-      <Reference Include="System" />
-      <Code Type="Fragment" Language="cs">
-        <![CDATA[
-           var directory = System.IO.Path.GetDirectoryName(FileName);
-           System.IO.Directory.CreateDirectory(directory);
-           var client = new System.Net.WebClient();
-           client.Proxy = System.Net.WebRequest.DefaultWebProxy;
-           client.Proxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
-           client.DownloadFile(Address, FileName);
-        ]]>
-      </Code>
-    </Task>
-  </UsingTask>
-
-  <Target Name="_RestoreBuildTools"
-    BeforeTargets="BuildAllProjects"
-    Inputs="$(BuildToolsTargetInputs)"
-    Outputs="$(BuildToolsTargetOutputs)"
-    >
-    <Message Importance="High" Text="Restoring build tools..." />
-
-    <!-- Download latest nuget.exe -->
-    <DownloadFile
-      Condition="!Exists($(NuGetToolPath))"
-      Address="https://nuget.org/nuget.exe"
-      FileName="$(NuGetToolPath)" />
-
-    <!-- Restore build tools -->
-    <Exec
-      StandardOutputImportance="Low"
-      Command="&quot;$(NuGetToolPath)&quot; install &quot; $(SourceDir).nuget\packages.config &quot;  -o &quot; $(PackagesDir) &quot; $(NuGetConfigCommandLine)" />
-
-    <Touch Files="$(BuildToolsInstallSemaphore)" AlwaysCreate="true" />
-  </Target>
-
   <ItemGroup>
     <Project Include="src\dirs.proj" />
   </ItemGroup>
 
+  <Import Project="dir.targets" />
+  
   <Import Project="dir.traversal.targets" />
+  
+  <PropertyGroup>
+    <TraversalBuildDependsOn>
+      BatchRestorePackages;
+      $(TraversalBuildDependsOn);
+    </TraversalBuildDependsOn>
+  </PropertyGroup>
+  
+  <Target Name="BatchRestorePackages">
+    <Message Importance="High" Text="Restoring all packages..." />
+    <!-- restore all project.jsons in one pass for perf & to avoid concurrency problems with dnu -->
+    <Exec Command="$(DnuRestoreCommand) $(DnuRestoreDirs)" StandardOutputImportance="Low" CustomErrorRegularExpression="^Unable to locate .*" />
+  </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 -->
   <Target Name="Clean">

diff --git a/tests/dir.props b/tests/dir.props
index e1b8c92..4ca119e 100644 (file)
--- a/tests/dir.props
+++ b/tests/dir.props
@@ -1,32 +1,73 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <!-- Build Tools Version -->
+  <!--
+    $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
+  -->
   <PropertyGroup>
-    <BuildToolsVersion>1.0.21-prerelease</BuildToolsVersion>
+    <OsEnvironment Condition="'$(OsEnvironment)'==''">$(OS)</OsEnvironment>
+  </PropertyGroup>
+  
+  <!-- Build Tools Versions -->
+  <PropertyGroup>
+    <BuildToolsVersion>1.0.25-prerelease-00056</BuildToolsVersion>
+    <BuildToolsCoreCLRVersion>1.0.2-prerelease</BuildToolsCoreCLRVersion>
+    <DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-beta5-12101</DnxVersion>
+    <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta5-12101</DnxVersion>
+    <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'!='Unix'">dnx-coreclr-win-x86.$(DnxVersion)</DnxPackageName>
+    <DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'=='Unix'">dnx-mono.$(DnxVersion)</DnxPackageName>
+    <RoslynVersion>1.0.0-rc3-20150510-01</RoslynVersion>
+    <RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName>
+    <BuildToolsCoreCLRPackageName>Microsoft.DotNet.BuildTools.CoreCLR</BuildToolsCoreCLRPackageName>
+    <BuildToolsCoreCLRLocation>$(ToolsDir)$(BuildToolsCoreCLRPackageName).$(BuildToolsCoreCLRVersion)</BuildToolsCoreCLRLocation>
   </PropertyGroup>
 
   <!-- Common repo directories -->
   <PropertyGroup>
     <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
     <SourceDir>$(ProjectDir)src\</SourceDir>
-    <PackagesDir>$(SourceDir)packages\</PackagesDir>
+    <PackagesDir>$(ProjectDir)packages\</PackagesDir>
     <ToolsDir>$(PackagesDir)Microsoft.DotNet.BuildTools.$(BuildToolsVersion)\lib\</ToolsDir>
   </PropertyGroup>
 
-
   <!-- Common nuget properties -->
   <PropertyGroup>
-    <NuGetToolPath>$(ToolsDir)NuGet.exe</NuGetToolPath>
-    <NuGetConfigFile>$(SourceDir)NuGet.Config</NuGetConfigFile>
-    <NuGetConfigCommandLine
-      Condition="Exists('$(NuGetConfigFile)')">-ConfigFile &quot;$(NuGetConfigFile)&quot;</NuGetConfigCommandLine>
-  </PropertyGroup>
+    <NuGetToolPath Condition="'$(NuGetToolPath)'==''">$(PackagesDir)NuGet.exe</NuGetToolPath>
+    <NuGetConfigFile Condition="'$(NuGetConfigFile)'==''">$(SourceDir)NuGet.Config</NuGetConfigFile>
+    <NuGetConfigCommandLine>-ConfigFile "$(NuGetConfigFile)"</NuGetConfigCommandLine>
 
-  <!-- Common build tool properties -->
+    <NugetRestoreCommand>"$(NuGetToolPath)"</NugetRestoreCommand>
+    <NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand>
+    <!-- Trim off the last slash so that nuget doesn't get confused and say there are illegal characters on
+         the path. -->
+    <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand>
+    <NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand>
+    <NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand>
+    <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand>
+  </PropertyGroup>
+  
+  <!-- list of directories to perform batch restore -->
+  <ItemGroup>
+    <DnuRestoreDir Include="&quot;$(MSBuildProjectDirectory)\src&quot;" />
+  </ItemGroup>
+  
+  <PropertyGroup Condition="'$(BuildAllProjects)'=='true'">
+    <!-- When we do a traversal build we get all packages up front, don't restore them again -->
+    <RestorePackages>false</RestorePackages>
+  </PropertyGroup>
+  
   <PropertyGroup>
-    <BuildToolsInstallSemaphore>$(ToolsDir)BuildTools.$(BuildToolsVersion).installed.semaphore</BuildToolsInstallSemaphore>
+    <DnxPackageDir Condition="'$(DnxPackageDir)'==''">$(PackagesDir)/$(DnxPackageName)/</DnxPackageDir>
+    <DnuToolPath Condition="'$(DnuToolPath)'=='' and '$(OsEnvironment)'!='Unix'">$(DnxPackageDir)\bin\dnu.cmd</DnuToolPath>
+    <DnuToolPath Condition="'$(DnuToolPath)'=='' and '$(OsEnvironment)'=='Unix'">$(DnxPackageDir)/bin/dnu</DnuToolPath>
 
-    <BuildToolsTargetInputs>$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)build.proj</BuildToolsTargetInputs>
-    <BuildToolsTargetOutputs>$(BuildToolsInstallSemaphore)</BuildToolsTargetOutputs>
+    <DnuRestoreSource>@(DnuSourceList -> '--source %(Identity)', ' ')</DnuRestoreSource>
+    <DnuRestoreDirs>@(DnuRestoreDir -> '%(Identity)', ' ')</DnuRestoreDirs>
+    
+    <DnuRestoreCommand>"$(DnuToolPath)"</DnuRestoreCommand>
+    <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand>
+    <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand>
+    <DnuRestoreCommand Condition="'$(LockDependencies)' == 'true'">$(DnuRestoreCommand) --lock</DnuRestoreCommand>
+    
   </PropertyGroup>
+  
 </Project>

diff --git a/tests/dir.targets b/tests/dir.targets
new file mode 100644 (file)
index 0000000..ad67078
--- /dev/null
+++ b/tests/dir.targets
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" InitialTargets="_RestoreBuildToolsWrapper" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Inline task to bootstrap the build to enable downloading nuget.exe -->
+  <UsingTask TaskName="DownloadFile" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll">
+    <ParameterGroup>
+      <Address ParameterType="System.String" Required="true" />
+      <FileName ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Reference Include="System" />
+      <Reference Include="System.IO" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+            var directory = System.IO.Path.GetDirectoryName(FileName);
+            Directory.CreateDirectory(directory);
+
+            var tempFile = Path.Combine(directory, Path.GetRandomFileName());
+            var client = new System.Net.WebClient();
+            client.Proxy = System.Net.WebRequest.DefaultWebProxy;
+            if (client.Proxy != null) client.Proxy.Credentials = System.Net.CredentialCache.DefaultCredentials;
+            var tryCount = 1;
+            var maxTries = 3;
+
+            while (tryCount <= maxTries)
+            {
+                try
+                {
+                    Log.LogMessage("Attempting to download {0}...", Address);
+                    client.DownloadFile(Address, tempFile);
+                    break;
+                }
+                catch (System.Net.WebException e)
+                {
+                    tryCount++;
+                    if (tryCount > maxTries)
+                    {
+                        throw;
+                    }
+                    else
+                    {
+                        Log.LogMessage(MessageImportance.High, "Download failed, retrying: {0}", e.Message);
+                    }
+                }
+            }
+
+            try
+            {
+                if (!File.Exists(FileName))
+                    File.Move(tempFile, FileName);
+            }
+            finally
+            {
+                if (File.Exists(tempFile))
+                    File.Delete(tempFile);
+            }
+        ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+
+  <!--
+    Needed to avoid the IntialTargets from having an Output which ends up getting
+    added to the output references when you have a project to project reference.
+  -->
+  <Target Name="_RestoreBuildToolsWrapper" DependsOnTargets="_RestoreBuildTools" />
+
+  <Target Name="_RestoreBuildTools"
+          Inputs="$(MSBuildThisFileDirectory)dir.props;$(SourceDir).nuget/packages.$(OsEnvironment).config"
+          Outputs="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath);$(DnuToolPath)">
+    <Message Importance="High" Text="Restoring build tools..." />
+
+    <Copy Condition="Exists('$(NuGetCachedPath)')" SourceFiles="$(NuGetCachedPath)" DestinationFiles="$(NuGetToolPath)" SkipUnchangedFiles="true" />
+
+    <!-- Download latest nuget.exe -->
+    <DownloadFile FileName="$(NuGetToolPath)"
+                  Address="https://www.nuget.org/nuget.exe"
+                  Condition="!Exists('$(NuGetToolPath)') and '$(OsEnvironment)'=='Windows_NT'" />
+
+    <Exec Command="curl -sSL --create-dirs -o $(NuGetToolPath) https://api.nuget.org/downloads/nuget.exe"
+          Condition="!Exists('$(NuGetToolPath)') and '$(OsEnvironment)'=='Unix'" />
+
+    <PropertyGroup>
+      <_RestoreBuildToolsCommand>$(NugetRestoreCommand) "$(SourceDir).nuget/packages.$(OsEnvironment).config"</_RestoreBuildToolsCommand>
+    </PropertyGroup>
+
+    <!-- Restore build tools -->
+    <Exec Command="$(_RestoreBuildToolsCommand)" StandardOutputImportance="Low" />
+
+    <!-- currently DNU doesn't support -ConfigFile: https://github.com/aspnet/dnx/issues/1693
+         Our DnuRestoreCommand doesn't force a config file  and we rely on the
+         directory probing for it to find nuget.config.  This works for restore from source,
+         but not restore from PackagesDir as happens for test project restore since PackagesDir
+         will not be under src.  To workaround, copy our nuget.config to packages. -->
+    <Copy Condition="Exists('$(NuGetConfigFile)')" SourceFiles="$(NuGetConfigFile)" DestinationFolder="$(PackagesDir)" SkipUnchangedFiles="true" />
+    <!-- <Copy Condition="Exists('$(NuGetConfigFile)')" SourceFiles="$(NuGetConfigFile)" DestinationFolder="$(IntermediateOutputRootPath)" SkipUnchangedFiles="true" /> -->
+
+    <!-- Add DNU and Roslyn tool execute rights -->
+    <Exec Condition="'$(OsEnvironment)'=='Unix'"
+          Command="chmod a+x &quot;$(DnxPackageDir)/bin/dnu&quot;" />
+    <Exec Condition="'$(OsEnvironment)'=='Unix'"
+          Command="chmod a+x &quot;$(DnxPackageDir)/bin/dnx&quot;" />
+    <Exec Condition="'$(OsEnvironment)'=='Unix'"
+          Command="find '$(RoslynPackageDir)tools' -name &quot;*.exe&quot; -exec chmod &quot;+x&quot; '{}' ';'" />
+
+    <Error Condition="'$(ErrorIfBuildToolsRestoredFromIndividualProject)'=='true'"
+           Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." />
+
+    <!--
+      There are cases where the inputs could be newer than the outputs but the
+      download or restore may not need to update. In such cases we need to touch
+      these files otherwise we continually run this target over and over for
+      every project until these files are cleaned (if the are ever cleaned).
+    -->
+    <Touch Files="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath);$(DnuToolPath)" />
+  </Target>
+
+  <!-- Provide default empty targets for BuildAndTest and Test which can be hooked onto or overridden as necessary -->
+  <Target Name="BuildAndTest" DependsOnTargets="Build;Test" />
+
+  <Target Name="Test" />
+</Project>

diff --git a/tests/dir.traversal.targets b/tests/dir.traversal.targets
index 2720f72..ad5a710 100644 (file)
--- a/tests/dir.traversal.targets
+++ b/tests/dir.traversal.targets
@@ -1,19 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Target Name="BuildAllProjects">
+    <PropertyGroup>
+      <DefaultBuildAllTarget Condition="'$(DefaultBuildAllTarget)'==''">$(MSBuildProjectDefaultTargets)</DefaultBuildAllTarget>
+    </PropertyGroup>
+
     <!-- To Serialize we use msbuild's batching functionality '%' to force it to batch all similar projects with the same identity 
          however since the project names are unique it will essentially force each to run in its own batch -->
-    <MSBuild Targets="Build" Projects="@(Project)" Condition="'$(SerializeProjects)'=='true'" Properties="Dummy=%(Identity)"/>
-    <MSBuild Targets="Build" Projects="@(Project)" Condition="'$(SerializeProjects)'!='true'" BuildInParallel="true" />
+    <MSBuild Targets="$(DefaultBuildAllTarget)"
+             Projects="@(Project)"
+             Condition="'$(SerializeProjects)'=='true'"
+             Properties="Dummy=%(Identity);DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true"
+             ContinueOnError="ErrorAndContinue" />
+
+    <MSBuild Targets="$(DefaultBuildAllTarget)"
+             Projects="@(Project)"
+             Condition="'$(SerializeProjects)'!='true'"
+             Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true"
+             BuildInParallel="true"
+             ContinueOnError="ErrorAndContinue" />
+
+    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
+    <Error Condition="'$(MSBuildLastTaskResult)'=='false'" />
   </Target>
 
   <Target Name="CleanAllProjects">
+    <PropertyGroup>
+      <DefaultCleanAllTarget Condition="'$(DefaultCleanAllTarget)'==''">Clean</DefaultCleanAllTarget>
+    </PropertyGroup>
+
     <!-- To Serialize we use msbuild's batching functionality '%' to force it to batch all similar projects with the same identity 
          however since the project names are unique it will essentially force each to run in its own batch -->
-    <MSBuild Targets="Clean" Projects="@(Project)" Condition="'$(SerializeProjects)'=='true'" Properties="Dummy=%(Identity)"/>
-    <MSBuild Targets="Clean" Projects="@(Project)" Condition="'$(SerializeProjects)'!='true'" BuildInParallel="true" />
+    <MSBuild Targets="$(DefaultCleanAllTarget)"
+             Projects="@(Project)"
+             Condition="'$(SerializeProjects)'=='true'"
+             Properties="Dummy=%(Identity);CleanAllProjects=true"
+             ContinueOnError="ErrorAndContinue" />
+
+    <MSBuild Targets="$(DefaultCleanAllTarget)"
+             Projects="@(Project)"
+             Condition="'$(SerializeProjects)'!='true'"
+             Properties="CleanAllProjects=true"
+             BuildInParallel="true"
+             ContinueOnError="ErrorAndContinue" />
+
+    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
+    <Error Condition="'$(MSBuildLastTaskResult)'=='false'" />
+  </Target>
+
+  <Target Name="RestoreAllProjectPackages">
+    <Message Importance="High" Text="Restoring project packages..." />
+
+    <PropertyGroup>
+      <DefaultRestoreAllPackagesTarget Condition="'$(DefaultRestoreAllPackagesTarget)'==''">RestorePackages</DefaultRestoreAllPackagesTarget>
+    </PropertyGroup>
+
+    <!-- To Serialize we use msbuild's batching functionality '%' to force it to batch all similar projects with the same identity 
+      however since the project names are unique it will essentially force each to run in its own batch -->
+    <MSBuild Targets="$(DefaultRestoreAllPackagesTarget)"
+             Projects="@(Project)"
+             Condition="'$(SerializeProjects)'=='true'"
+             Properties="Dummy=%(Identity);RestoreAllPackages=true"
+             ContinueOnError="ErrorAndContinue" />
+
+    <MSBuild Targets="$(DefaultRestoreAllPackagesTarget)"
+             Projects="@(Project)"
+             Condition="'$(SerializeProjects)'!='true'"
+             Properties="RestoreAllPackages=true"
+             BuildInParallel="true"
+             ContinueOnError="ErrorAndContinue" />
+
+    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
+    <Error Condition="'$(MSBuildLastTaskResult)'=='false'" />
   </Target>
 
   <PropertyGroup>
@@ -21,16 +80,24 @@
       BuildAllProjects;
       $(TraversalBuildDependsOn);
     </TraversalBuildDependsOn>
-    
+
     <TraversalCleanDependsOn>
       CleanAllProjects;
       $(TraversalCleanDependsOn);
     </TraversalCleanDependsOn>
+
+    <TraversalRestorePackagesDependsOn>
+      RestoreAllProjectPackages;
+      $(TraversalRestorePackagesDependsOn)
+    </TraversalRestorePackagesDependsOn>
   </PropertyGroup>
 
   <Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" />
 
   <Target Name="Clean" DependsOnTargets="$(TraversalCleanDependsOn)" />
+
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
-</Project>
+  <Target Name="RestorePackages" DependsOnTargets="$(TraversalRestorePackagesDependsOn)" />
+
+</Project>
\ No newline at end of file

diff --git a/tests/override.targets b/tests/override.targets
new file mode 100644 (file)
index 0000000..71a8b1f
--- /dev/null
+++ b/tests/override.targets
@@ -0,0 +1,33 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    Overrides for all other targets (including build tools) can go in this file.
+  -->
+
+  <Import Project="mono.targets" Condition="'$(OsEnvironment)'=='Unix'" />
+  <Import Project="roslyn.xplat.targets" Condition="'$(OsEnvironment)'=='Unix' and '$(UseRoslynCompiler)'=='true'" />
+  <!-- Contains overrides for the nuget reference resolution.  The regular nuget reference resolution will not 
+       copy references local, which we need in order to correctly execute the xunit project -->
+  <Import Project="xunitwrapper.targets" Condition="'$(IsXunitWrapperProject)'=='true'" />
+  
+  <!-- Override the AddDesignTimeFacadeReferences target to add the ability to reference the local version of mscorlib.
+       Some tests use functionality not available in the portable reference assemblies.
+       For portability reasons it's generally a good idea to reference the facades instead of the 
+       raw implementation assemblies.  However, these tests are useful. -->
+  <Target Name="AddDesignTimeFacadeReferences"
+      Condition="'$(TargetingDefaultPlatform)' == 'true'"
+      BeforeTargets="ResolveReferences"
+      DependsOnTargets="GetReferenceAssemblyPaths"
+  >
+    <PropertyGroup>
+      <_resolvedMscorlib Condition="'%(ReferencePath.FileName)' == 'mscorlib'">true</_resolvedMscorlib>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PossibleTargetFrameworks Include="$(_TargetFrameworkDirectories)" />
+      <ReferencePath Include="%(PossibleTargetFrameworks.Identity)mscorlib.dll" 
+                     Condition="'$(ReferenceLocalMscorlib)' != 'true' and '$(_resolvedMscorlib)' != 'true' and '%(PossibleTargetFrameworks.Identity)' != '' and Exists('%(PossibleTargetFrameworks.Identity)mscorlib.dll')" />
+      <ReferencePath Include="$(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType)\mscorlib.dll" 
+                     Condition="'$(ReferenceLocalMscorlib)' == 'true' and '$(_resolvedMscorlib)' != 'true'" />
+    </ItemGroup>
+  </Target>
+</Project>

diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index 901e92c..f8dd96f 100644 (file)
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -1,63 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <UsingTask TaskName="ResolveNuGetPackages" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
-
+  <UsingTask TaskName="ResolveNuGetPackageAssets" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
   
   <ItemGroup>
-    <TestTargetFramework Include="ASP.NetCore, version=v5.0">
-      <Folder>aspnetcore50</Folder>
+    <TestTargetFramework Include="DNXCore,Version=v5.0">
+      <Folder>dnxcore50</Folder>
     </TestTargetFramework>
   </ItemGroup>
-
   
   <ItemGroup>
-    <AllPackagesConfigFile Include="$(SourceDir)**\*\packages.config"/>
+    <AllProjectJsonLockFiles Include="$(SourceDir)**\*\project.lock.json"/>
   </ItemGroup>
 
   <Target Name="CopyDependecyToCoreRoot"
-    Inputs="@(AllPackagesConfigFile)"
+    Inputs="@(AllProjectJsonLockFiles)"
     Outputs="$(CORE_ROOT)\*.*">
     
-    
-  <ItemGroup>
-    <PackagesConfigFileExclude Include="$(SourceDir).nuget\packages.config" />
-    <PackagesConfigFileExclude Include="$(SourceDir)Test*\**\packages.config" />
-    <PackagesConfigFileExclude Include="$(SourceDir)packages\**\*\packages.config" />
-  </ItemGroup>
+    <ItemGroup>
+      <ProjectJsonLockFileExclude Include="$(SourceDir).nuget\project.lock.json" />
+      <ProjectJsonLockFileExclude Include="$(SourceDir)Test*\**\project.lock.json" />
+      <ProjectJsonLockFileExclude Include="$(SourceDir)Common\Coreclr.TestWrapper\**\project.lock.json" />
+      <ProjectJsonLockFileExclude Include="$(SourceDir)packages\**\*\project.lock.json" />
+    </ItemGroup>
 
-  <Message Text= "PackagesConfigFileExclude= @(PackagesConfigFileExclude)"/>
+    <ItemGroup>
+      <ProjectLockJsonFiles Include="@(AllProjectJsonLockFiles)"  Exclude="@(ProjectJsonLockFileExclude)"/>
+    </ItemGroup>
+    
+    <!-- This will use the overridden ResolveNuGetPackageAssets, which outputs copy local items
+         for the xunit wrapper projects -->
+    <ResolveNuGetPackageAssets  Architecture="$(PlatformTarget)"
+                                Configuration="$(Configuration)"
+                                Language="$(Language)"
+                                PackageRoot="$(PackagesDir)"
+                                ProjectLockFile="%(ProjectLockJsonFiles.Identity)"
+                                TargetFrameworkMonikers="@(TestTargetFramework)"
+                                TargetPlatformMonikers="$(TargetPlatformMoniker)">
 
-  <ItemGroup>
-    <PackagesConfigFile Include="@(AllPackagesConfigFile)"  Exclude="@(PackagesConfigFileExclude)"/>
-  </ItemGroup>
-    <ResolveNuGetPackages PackagesConfigs="@(PackagesConfigFile)"
-                          PackageRoot="$(PackagesDir)"
-                          Platform="$(PlatformTarget)"
-                          Configuration="$(NuGetConfiguration)"
-                          Language="$(Language)"
-                          TargetFramework="%(TestTargetFramework.Identity)"
-                          TargetPlatformMoniker="$(TargetPlatformMoniker)">
+      <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" />
+      <Output TaskParameter="ResolvedReferences" ItemName="Reference" />
+      <Output TaskParameter="ResolvedCopyLocalItems" ItemName="RunTimeCopyLocal" />
+    </ResolveNuGetPackageAssets>
 
-      <Output TaskParameter="ResolvedCopyLocal" ItemName="RunTimeCopyLocal" />
-    </ResolveNuGetPackages>
-    
     <ItemGroup>
-</ItemGroup>
-
-<ItemGroup>
-    <RunTimeDependecyExclude Include="$(CORE_ROOT)\**\*.*"  />
-    <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName)%(Extension)')" />
-    <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).ni%(Extension)')" />
-    <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).pdb')" />
-    <AllResolvedRuntimeDependencies Include="@(RunTimeCopyLocal -> '%(FileName)%(Extension)')">
+      <RunTimeDependecyExclude Include="$(CORE_ROOT)\**\*.*"  />
+      <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName)%(Extension)')" />
+      <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).ni%(Extension)')" />
+      <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).pdb')" />
+      <AllResolvedRuntimeDependencies Include="@(RunTimeCopyLocal -> '%(FileName)%(Extension)')">
         <File>%(Identity)</File>
-    </AllResolvedRuntimeDependencies>
-    <RunTimeDependecyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)"  Exclude="@(RunTimeDependecyExcludeFiles)"/>
-    <RunTimeDependecyCopyLocal Include="@(RunTimeDependecyCopyLocalFile -> '%(File)')"  />
-    </ItemGroup> 
-    <Message Text= "RunTimeDependecyCopyLocal= @(RunTimeDependecyCopyLocal)"/>
-    <Message Text= "RunTimeDependecyExcludeFiles= @(RunTimeDependecyExcludeFiles)"/>
+      </AllResolvedRuntimeDependencies>
+      <RunTimeDependecyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)"  Exclude="@(RunTimeDependecyExcludeFiles)"/>
+      <RunTimeDependecyCopyLocal Include="@(RunTimeDependecyCopyLocalFile -> '%(File)')"  />
+    </ItemGroup>
+    
     <Copy
       SourceFiles="@(RunTimeDependecyCopyLocal)"
       DestinationFolder="$(CORE_ROOT)"

diff --git a/tests/runtest.cmd b/tests/runtest.cmd
index 280bb46..a96cbb8 100644 (file)
--- a/tests/runtest.cmd
+++ b/tests/runtest.cmd
@@ -83,8 +83,8 @@ set __TestRunBuildLog=%__LogsDir%\TestRunResults_%__BuildOS%__%__BuildArch%__%__
 set __TestRunHtmlLog=%__LogsDir%\TestRun_%__BuildOS%__%__BuildArch%__%__BuildType%.html
 set __TestRunXmlLog=%__LogsDir%\TestRun_%__BuildOS%__%__BuildArch%__%__BuildType%.xml
 
-echo "Core_Root that will be used is : %Core_Root%"
-echo "Starting The Test Run .. "
+echo Core_Root that will be used is: %Core_Root%
+echo Starting The Test Run ...
 if  "%__SkipWrapperGeneration%"=="true" goto :preptests
 
 :: Log build command line
@@ -115,8 +115,8 @@ set _buildpostfix=
 set _buildappend=
 if not "%noCore_RootSet%"=="true" goto :runtests 
 set Core_Root=%XunitTestBinBase%\Tests\Core_Root
-echo "Using Default Core_Root as %Core_Root% " 
-echo "Copying Built binaries from  %__BinDir% to %Core_Root%"
+echo Using Default Core_Root as %Core_Root%
+echo Copying Built binaries from  %__BinDir% to %Core_Root%
 if exist %Core_Root% rd /s /q %Core_Root%
 md %Core_Root%
 xcopy /s %__BinDir% %Core_Root%
@@ -128,6 +128,8 @@ if ERRORLEVEL 1 (
     exit /b 1
 )
 
+exit /b 0
+
 :runtests
 %_buildprefix% %_msbuildexe% "%__ProjectFilesDir%runtest.proj" /p:NoBuild=true /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%__TestRunBuildLog%";Append %1 %_buildpostfix% /clp:showcommandline
 exit /b %ERRORLEVEL%

diff --git a/tests/runtest.proj b/tests/runtest.proj
index b703e20..71549d1 100644 (file)
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -25,7 +25,8 @@
   
       <AllTestDirsNonCanonicalPaths Include="$([System.IO.Directory]::GetDirectories(`$(XunitTestBinBase)`))" />
 
-      <AllTestDirsPaths Include="@(AllTestDirsNonCanonicalPaths)">
+      <AllTestDirsPaths Include="@(AllTestDirsNonCanonicalPaths)" />
+      <AllTestDirsPaths Include="@(AllTestDirsNonCanonicalPaths)" >
         <Path>$([System.IO.Path]::GetFullPath(%(Identity)))</Path>
       </AllTestDirsPaths>
 
@@ -43,8 +44,6 @@
                 TaskParameter="Filtered"
                 ItemName="TestDirectories"/>
         </RemoveDuplicates>
-    <Message Text= "TestDirectories= @(TestDirectories)"/>
-    <Message Text= "NonExcludedTestDirectories= @(NonExcludedTestDirectories)"/>
   </Target>
 
   
@@ -67,12 +66,10 @@ $(_XunitEpilog)
       <XunitVersionCompiled>2.0.0-beta5-build2785</XunitVersionCompiled>
       <XunitWrapperGenCsProj>
         <![CDATA[
-        <?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     
-    <Import Project="$(SourceDir)\dir.common.props" />
-    <Import Project="$(SourceDir)\packages\xunit.core.$(XunitVersionCompiled)\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props" Condition="Exists('$(SourceDir)\packages\xunit.core.$(XunitVersionCompiled)\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props')" />
-    <Import Project="%24(MSBuildExtensionsPath)\%24(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('%24(MSBuildExtensionsPath)\%24(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="%24([MSBuild]::GetDirectoryNameOfFileAbove(%24(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '%24(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '%24(Platform)' == '' ">AnyCPU</Platform>
@@ -80,11 +77,13 @@ $(_XunitEpilog)
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
+    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <IsXunitWrapperProject>true</IsXunitWrapperProject>
+    <SkipSigning>true</SkipSigning>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB}%3B{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>%24(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="%24(SolutionDir) == '' Or %24(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
@@ -96,11 +95,6 @@ $(_XunitEpilog)
   <PropertyGroup Condition=" '%24(Configuration)|%24(Platform)' == 'Release|AnyCPU' ">
   </PropertyGroup>
   <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '%24(VS100COMNTOOLS)' != '' " Include="%24(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="$(XunitWrapper).cs" />
   </ItemGroup>
   <ItemGroup>
@@ -109,7 +103,7 @@ $(_XunitEpilog)
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
    <ItemGroup>
-    <ProjectReference Include="$(SourceDir)\Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper.csproj">
+    <ProjectReference Include="$(SourceDir)Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper.csproj">
       <Project>{8ffe99c0-22f8-4462-b839-970eac1b3472}</Project>
       <Name>coreclr</Name>
     </ProjectReference>
@@ -117,46 +111,31 @@ $(_XunitEpilog)
  
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="xunit.abstractions">
-      <HintPath>$(SourceDir)\packages\xunit.abstractions.$(XunitVersionCompiled)\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert">
-      <HintPath>$(SourceDir)\packages\xunit.assert.$(XunitVersionCompiled)\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monoandroid+monotouch10\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>$(SourceDir)\packages\xunit.core.$(XunitVersionCompiled)\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Reference Include="System.Runtime" />
+    <Reference Include="mscorlib" />
   </ItemGroup>
+  <Import Project="%24([MSBuild]::GetDirectoryNameOfFileAbove(%24(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup>
      <OutDir>$(XunitWrapperOutputIntermediatedDirBase)\XunitRunner\</OutDir>
-     <OutputPath>$(XunitWrapperOutputIntermediatedDirBase)\XunitRunner\</OutputPath>
   </PropertyGroup>
-  <Import Project="%24(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SourceDir)\packages\xunit.core.$(XunitVersionCompiled)\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SourceDir)\packages\xunit.core.$(XunitVersionCompiled)\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props'))" />
-  </Target>
 </Project>
-
-
-  ]]>
+        ]]>
       </XunitWrapperGenCsProj>
       <XunitWrapperGenPackConfig>
         <![CDATA[
-        <?xml version="1.0" encoding="utf-8"?>
-       <packages>
-       <packages>
-      <package id="xunit" version="2.0.0-beta5-build2785" targetFramework="net45" />
-     <package id="xunit.abstractions" version="2.0.0-beta5-build2785" targetFramework="net45" />
-     <package id="xunit.assert" version="2.0.0-beta5-build2785" targetFramework="net45" />
-     <package id="xunit.core" version="2.0.0-beta5-build2785" targetFramework="net45" />
-</packages>
-      </packages>
+{
+  "dependencies": {
+    "xunit" : "2.0.0-beta5-build2785",
+    "xunit.abstractions" : "2.0.0-beta5-build2785",
+    "xunit.assert" : "2.0.0-beta5-build2785",
+    "xunit.core" : "2.0.0-beta5-build2785",
+    "xunit.execution" : "2.0.0-beta5-build2785",
+    "xunit.runners" : "2.0.0-beta5-build2785"
+  },
+  "frameworks": {
+    "net45": {}
+  }
+}
       ]]>
       </XunitWrapperGenPackConfig>
 
@@ -177,7 +156,7 @@ $(_XunitEpilog)
 
     <!-- Write the file -->
     <WriteLinesToFile
-      File="$(XunitWrapperSrcDir)\packages.config"
+      File="$(XunitWrapperSrcDir)\project.json"
       Lines="$(XunitWrapperGenPackConfig)"
       Overwrite="true" />
 
@@ -323,29 +302,30 @@ public class $([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)"
   </Target>
 
   <Target Name="GetListOfTestCmds">
-  <ItemGroup>
+    <ItemGroup>
       <AllRunnableTestPaths Include="$(XunitTestBinBase)\**\*.cmd" />
-  </ItemGroup>
+    </ItemGroup>
   </Target> 
   
   <Import Project="tests.targets" />
   <Import Project="publishdependency.targets" />
-  <Target Name="CreateXunitWrappers"
-          DependsOnTargets="Clean"
-          AfterTargets="Build">
-
+ 
+  <Target Name="Build">
+    <!-- Default for building -->
     <MSBuild Projects="$(MSBuildProjectFile)"
-             Targets="CreateAllWrappers"
-             Properties="_CMDDIR=%(TestDirectories.Identity)" />
-
+         Targets="CreateAllWrappers"
+         Properties="_CMDDIR=%(TestDirectories.Identity)"
+         Condition=" '$(NoBuild)'!='true' " />
+         
+    <!-- Execution -->
+    
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyDependecyToCoreRoot"
              Condition=" '$(NoRun)'!='true' "/>
          
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="RunTests"
              Condition=" '$(NoRun)'!='true' "/>
   </Target>
- 
-  <Target Name="Build" />
+  
   <Target Name="Clean">
     <RemoveDir Condition=" '$(NoBuild)'!='true'" Directories="$(XunitWrapperGeneratedCSDirBase);$(XunitWrapperOutputIntermediatedDirBase)" ContinueOnError="WarnAndContinue" /> 
   </Target>

diff --git a/tests/src/.nuget/packages.Unix.config b/tests/src/.nuget/packages.Unix.config
new file mode 100644 (file)
index 0000000..ef02441
--- /dev/null
+++ b/tests/src/.nuget/packages.Unix.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.0-beta5-12101" />
+</packages>

diff --git a/tests/src/.nuget/packages.Windows_NT.config b/tests/src/.nuget/packages.Windows_NT.config
new file mode 100644 (file)
index 0000000..84282b3
--- /dev/null
+++ b/tests/src/.nuget/packages.Windows_NT.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00056" />
+  <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />
+</packages>

diff --git a/tests/src/.nuget/packages.config b/tests/src/.nuget/packages.config
deleted file mode 100644 (file)
index 49ceb0d..0000000
--- a/tests/src/.nuget/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.DotNet.BuildTools" version="1.0.21-prerelease" />
-</packages>

diff --git a/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
index 4d1dc20..ccce5e8 100644 (file)
--- a/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
+++ b/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);WINCORESYS;$([System.String]::Copy('$(BuildArch)').ToUpper())</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -40,11 +40,10 @@
     <Compile Include="Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Common/CoreCLRTestLibrary/packages.config b/tests/src/Common/CoreCLRTestLibrary/packages.config
deleted file mode 100644 (file)
index 2788e5b..0000000
--- a/tests/src/Common/CoreCLRTestLibrary/packages.config
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.Diagnostics.Process" version="4.0.0-beta-22412" />
-  <package id="System.IO" version="4.0.10-beta-22412" />
-  <package id="System.IO.FileSystem" version="4.0.0-beta-22412" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.0-beta-22412" />
-  <package id="System.Runtime" version="4.0.20-beta-22412" />
-  <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-  <package id="System.Runtime.Handles" version="4.0.0-beta-22412" />
-  <package id="System.Threading" version="4.0.0-beta-22412" />
-  <package id="System.Globalization.Calendars" version="4.0.0-beta-22512" />
-  <package id="System.Globalization" version="4.0.10-beta-22512" />
-  <package id="System.Text.Encoding" version="4.0.10-beta-22512" />
-  <package id="System.Runtime.InteropServices" version="4.0.20-beta-22512" />
-  <package id="System.Collections" version="4.0.10-beta-22512" />
-  <package id="System.Console" version="4.0.0-beta-22405" />
-  <package id="System.Reflection" version="4.0.10-beta-22512" />
-  <package id="System.Reflection.Primitives" version="4.0.0-beta-22512" />
-</packages>

diff --git a/tests/src/Common/CoreCLRTestLibrary/project.json b/tests/src/Common/CoreCLRTestLibrary/project.json
new file mode 100644 (file)
index 0000000..a3ea4b3
--- /dev/null
+++ b/tests/src/Common/CoreCLRTestLibrary/project.json
@@ -0,0 +1,23 @@
+{
+  "dependencies": {
+    "System.Diagnostics.Process": "4.0.0-beta-*",
+    "System.IO": "4.0.10-beta-*",
+    "System.IO.FileSystem": "4.0.0-beta-*",
+    "System.IO.FileSystem.Primitives": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Runtime.Handles": "4.0.0-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+    "System.Globalization.Calendars": "4.0.0-beta-*",
+    "System.Globalization": "4.0.10-beta-*",
+    "System.Text.Encoding": "4.0.10-beta-*",
+    "System.Runtime.InteropServices": "4.0.20-beta-*",
+    "System.Collections": "4.0.10-beta-*",
+    "System.Console": "4.0.0-beta-*",
+    "System.Reflection": "4.0.10-beta-*",
+    "System.Reflection.Primitives": "4.0.0-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Common/CoreCLRTestLibrary/project.lock.json b/tests/src/Common/CoreCLRTestLibrary/project.lock.json
new file mode 100644 (file)
index 0000000..8ea9a49
--- /dev/null
+++ b/tests/src/Common/CoreCLRTestLibrary/project.lock.json
@@ -0,0 +1,1079 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "Microsoft.Win32.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/Microsoft.Win32.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/Microsoft.Win32.Primitives.dll": {}
+        }
+      },
+      "Microsoft.Win32.Registry/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/Microsoft.Win32.Registry.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/Microsoft.Win32.Registry.dll": {}
+        }
+      },
+      "System.Collections/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Collections.dll": {}
+        }
+      },
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Diagnostics.Debug/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Debug.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Debug.dll": {}
+        }
+      },
+      "System.Diagnostics.Process/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.IO.FileSystem": "4.0.0-beta-23024",
+          "System.Security.SecureString": "4.0.0-beta-23024",
+          "Microsoft.Win32.Registry": "4.0.0-beta-23024",
+          "Microsoft.Win32.Primitives": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Threading.Thread": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Threading.ThreadPool": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Process.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Process.dll": {}
+        }
+      },
+      "System.Globalization/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Globalization.dll": {}
+        }
+      },
+      "System.Globalization.Calendars/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.Calendars.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Globalization.Calendars.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Threading.Overlapped": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.FileSystem.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Security.Cryptography.Encryption/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Security.Cryptography.Encryption.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Security.Cryptography.Encryption.dll": {}
+        }
+      },
+      "System.Security.SecureString/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Security.Cryptography.Encryption": "4.0.0-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Security.SecureString.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Security.SecureString.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Overlapped/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Overlapped.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Overlapped.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Thread/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Thread.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Thread.dll": {}
+        }
+      },
+      "System.Threading.ThreadPool/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.InteropServices": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.ThreadPool.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.ThreadPool.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "Microsoft.Win32.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CILMy3sPDbjCjDhaP43dLVGD7E613CUVo7TpQGo2HjoG7Stv5JMiGsOJB3P4Mqymtb+P8FKYzchJwifCnO7cbw==",
+      "files": [
+        "Microsoft.Win32.Primitives.4.0.0-beta-23024.nupkg",
+        "Microsoft.Win32.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "Microsoft.Win32.Primitives.nuspec",
+        "lib/dotnet/Microsoft.Win32.Primitives.dll",
+        "lib/net46/Microsoft.Win32.Primitives.dll",
+        "ref/dotnet/Microsoft.Win32.Primitives.dll",
+        "ref/dotnet/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/de/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/es/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/fr/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/it/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/ja/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/ko/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/ru/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/zh-hans/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/zh-hant/Microsoft.Win32.Primitives.xml",
+        "ref/net46/Microsoft.Win32.Primitives.dll"
+      ]
+    },
+    "Microsoft.Win32.Registry/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CjFtCuQcX0BEo7gQaI7y+mHph+QTcQf1gQiVV6Pog4PNgjMUjoefF0xEEVEbxWKAVJ66Ugf2i6r+UG3pxoUTKA==",
+      "files": [
+        "Microsoft.Win32.Registry.4.0.0-beta-23024.nupkg",
+        "Microsoft.Win32.Registry.4.0.0-beta-23024.nupkg.sha512",
+        "Microsoft.Win32.Registry.nuspec",
+        "lib/DNXCore50/Microsoft.Win32.Registry.dll",
+        "lib/net46/Microsoft.Win32.Registry.dll",
+        "ref/dotnet/Microsoft.Win32.Registry.dll",
+        "ref/dotnet/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/de/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/es/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/fr/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/it/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/ja/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/ko/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/ru/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/zh-hans/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/zh-hant/Microsoft.Win32.Registry.xml",
+        "ref/net46/Microsoft.Win32.Registry.dll"
+      ]
+    },
+    "System.Collections/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "2ISUf3MQt7JbeT6kXg36qY3fnkjykPXccHcBP0qyTc5vEjbLihC7KCxkHPFJWteKR8lvvSF3+8ES5J34VqezmQ==",
+      "files": [
+        "System.Collections.4.0.10-beta-23024.nupkg",
+        "System.Collections.4.0.10-beta-23024.nupkg.sha512",
+        "System.Collections.nuspec",
+        "lib/DNXCore50/System.Collections.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Collections.dll",
+        "ref/dotnet/System.Collections.dll",
+        "ref/dotnet/System.Collections.xml",
+        "ref/dotnet/de/System.Collections.xml",
+        "ref/dotnet/es/System.Collections.xml",
+        "ref/dotnet/fr/System.Collections.xml",
+        "ref/dotnet/it/System.Collections.xml",
+        "ref/dotnet/ja/System.Collections.xml",
+        "ref/dotnet/ko/System.Collections.xml",
+        "ref/dotnet/ru/System.Collections.xml",
+        "ref/dotnet/zh-hans/System.Collections.xml",
+        "ref/dotnet/zh-hant/System.Collections.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Collections.dll"
+      ]
+    },
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Diagnostics.Debug/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "dnfynhlmsMaRB/YvN5JifCdYYnRf/mTjFAAM1awp3wrjsgOSpAzOE4sxYX0hdY1FyAFTDcUnusQ+H3AMcF3Stw==",
+      "files": [
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg",
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Debug.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Debug.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.xml",
+        "ref/dotnet/de/System.Diagnostics.Debug.xml",
+        "ref/dotnet/es/System.Diagnostics.Debug.xml",
+        "ref/dotnet/fr/System.Diagnostics.Debug.xml",
+        "ref/dotnet/it/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ja/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ko/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ru/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Debug.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Debug.dll"
+      ]
+    },
+    "System.Diagnostics.Process/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "tcEFjAg6pxyviDO0FSSnhauEyxV/dfm5MbbS4cBG4hIYYcI3TuH8+pFm8oWwGl3WoJlL2WrN5QySwDON0z6OKQ==",
+      "files": [
+        "System.Diagnostics.Process.4.0.0-beta-23024.nupkg",
+        "System.Diagnostics.Process.4.0.0-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Process.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Process.dll",
+        "lib/net46/System.Diagnostics.Process.dll",
+        "ref/dotnet/System.Diagnostics.Process.dll",
+        "ref/dotnet/System.Diagnostics.Process.xml",
+        "ref/dotnet/de/System.Diagnostics.Process.xml",
+        "ref/dotnet/es/System.Diagnostics.Process.xml",
+        "ref/dotnet/fr/System.Diagnostics.Process.xml",
+        "ref/dotnet/it/System.Diagnostics.Process.xml",
+        "ref/dotnet/ja/System.Diagnostics.Process.xml",
+        "ref/dotnet/ko/System.Diagnostics.Process.xml",
+        "ref/dotnet/ru/System.Diagnostics.Process.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Process.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Process.xml",
+        "ref/net46/System.Diagnostics.Process.dll"
+      ]
+    },
+    "System.Globalization/4.0.10-beta-23024": {
+      "sha512": "RROZnwQ8phf5Sbb6h8rdnQCoppfKdWKmQ4CiWfvpbRG5XwWbVrMyZsBYazLTQ59MFXe8RXYHgHvE9OfnZPTCLQ==",
+      "files": [
+        "System.Globalization.4.0.10-beta-23024.nupkg",
+        "System.Globalization.4.0.10-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/DNXCore50/System.Globalization.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Globalization.dll"
+      ]
+    },
+    "System.Globalization.Calendars/4.0.0-beta-23024": {
+      "sha512": "2RC9/SZGrddxhOIWcRxHHi8YFsq9Av9znHKVgEu+cJe4Wt67b79i1GVXawcIu/Uu+XORmQKNT+V8PO86Jjligg==",
+      "files": [
+        "System.Globalization.Calendars.4.0.0-beta-23024.nupkg",
+        "System.Globalization.Calendars.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.Calendars.nuspec",
+        "lib/DNXCore50/System.Globalization.Calendars.dll",
+        "lib/net46/System.Globalization.Calendars.dll",
+        "lib/netcore50/System.Globalization.Calendars.dll",
+        "ref/dotnet/System.Globalization.Calendars.dll",
+        "ref/dotnet/System.Globalization.Calendars.xml",
+        "ref/dotnet/de/System.Globalization.Calendars.xml",
+        "ref/dotnet/es/System.Globalization.Calendars.xml",
+        "ref/dotnet/fr/System.Globalization.Calendars.xml",
+        "ref/dotnet/it/System.Globalization.Calendars.xml",
+        "ref/dotnet/ja/System.Globalization.Calendars.xml",
+        "ref/dotnet/ko/System.Globalization.Calendars.xml",
+        "ref/dotnet/ru/System.Globalization.Calendars.xml",
+        "ref/dotnet/zh-hans/System.Globalization.Calendars.xml",
+        "ref/dotnet/zh-hant/System.Globalization.Calendars.xml",
+        "ref/net46/System.Globalization.Calendars.dll",
+        "runtimes/win8-aot/lib/netcore50/System.Globalization.Calendars.dll"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CUlwZ5kM4QRQgsVj9/QQIr86hLr7U/E6evFXg6643qd63BppdfORu46tyQMxS/gsdrT4PiIRu7rrrguXiBR5ww==",
+      "files": [
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.nuspec",
+        "lib/DNXCore50/System.IO.FileSystem.dll",
+        "lib/net46/System.IO.FileSystem.dll",
+        "lib/netcore50/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.xml",
+        "ref/dotnet/de/System.IO.FileSystem.xml",
+        "ref/dotnet/es/System.IO.FileSystem.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.xml",
+        "ref/dotnet/it/System.IO.FileSystem.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.xml",
+        "ref/net46/System.IO.FileSystem.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.10-beta-23024": {
+      "sha512": "Ky5yclJBgNu+NArFSblpe2FZ/IeLeOYLIP8hLBwTiVDRufjWDqPKcPtETfnmyZq61HGyhTJWFd1uEkhDOgxF9g==",
+      "files": [
+        "System.Reflection.4.0.10-beta-23024.nupkg",
+        "System.Reflection.4.0.10-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/DNXCore50/System.Reflection.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.dll"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Security.Cryptography.Encryption/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "LGHXdvs2WCJjLSKuvn+0SDZhevPyaHNwHx3BiojKsCYPfP3RmTqVMWAAn/tGpn18zV6E1TWGhuJt8xWtbjJk0Q==",
+      "files": [
+        "System.Security.Cryptography.Encryption.4.0.0-beta-23024.nupkg",
+        "System.Security.Cryptography.Encryption.4.0.0-beta-23024.nupkg.sha512",
+        "System.Security.Cryptography.Encryption.nuspec",
+        "lib/DNXCore50/System.Security.Cryptography.Encryption.dll",
+        "lib/net46/System.Security.Cryptography.Encryption.dll",
+        "ref/dotnet/System.Security.Cryptography.Encryption.dll",
+        "ref/dotnet/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/de/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/es/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/fr/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/it/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/ja/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/ko/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/ru/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/zh-hans/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/zh-hant/System.Security.Cryptography.Encryption.xml",
+        "ref/net46/System.Security.Cryptography.Encryption.dll"
+      ]
+    },
+    "System.Security.SecureString/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "Spz5h3BDm58mpoQp/KkZ0y6UEeNSnpNqqxEZ+ZIDQElHd/gWugPEVooKWLi8PwIh+J1gzoD298lsaKUO2Y6Opg==",
+      "files": [
+        "System.Security.SecureString.4.0.0-beta-23024.nupkg",
+        "System.Security.SecureString.4.0.0-beta-23024.nupkg.sha512",
+        "System.Security.SecureString.nuspec",
+        "lib/DNXCore50/System.Security.SecureString.dll",
+        "lib/net46/System.Security.SecureString.dll",
+        "ref/dotnet/System.Security.SecureString.dll",
+        "ref/dotnet/System.Security.SecureString.xml",
+        "ref/dotnet/de/System.Security.SecureString.xml",
+        "ref/dotnet/es/System.Security.SecureString.xml",
+        "ref/dotnet/fr/System.Security.SecureString.xml",
+        "ref/dotnet/it/System.Security.SecureString.xml",
+        "ref/dotnet/ja/System.Security.SecureString.xml",
+        "ref/dotnet/ko/System.Security.SecureString.xml",
+        "ref/dotnet/ru/System.Security.SecureString.xml",
+        "ref/dotnet/zh-hans/System.Security.SecureString.xml",
+        "ref/dotnet/zh-hant/System.Security.SecureString.xml",
+        "ref/net46/System.Security.SecureString.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Overlapped/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "i5FkjE3Y++zufCyS68xiq8t/lwPyS2+urpv0MZUOID0pggCpqJiUGV5bnJRBo9Da79rpnVeFBleDOVFCnr2lrw==",
+      "files": [
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg",
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Overlapped.nuspec",
+        "lib/DNXCore50/System.Threading.Overlapped.dll",
+        "lib/net46/System.Threading.Overlapped.dll",
+        "lib/netcore50/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.xml",
+        "ref/dotnet/de/System.Threading.Overlapped.xml",
+        "ref/dotnet/es/System.Threading.Overlapped.xml",
+        "ref/dotnet/fr/System.Threading.Overlapped.xml",
+        "ref/dotnet/it/System.Threading.Overlapped.xml",
+        "ref/dotnet/ja/System.Threading.Overlapped.xml",
+        "ref/dotnet/ko/System.Threading.Overlapped.xml",
+        "ref/dotnet/ru/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hans/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hant/System.Threading.Overlapped.xml",
+        "ref/net46/System.Threading.Overlapped.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Thread/4.0.0-beta-23024": {
+      "sha512": "aeok537DgipEVRaoFjfYFf5MAyKm6eXKQQibvvHDertRXx+h1a7sIxt+K9QEHbjxDeKC+06orbGMlasNPSLxHA==",
+      "files": [
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg",
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Thread.nuspec",
+        "lib/DNXCore50/System.Threading.Thread.dll",
+        "lib/net46/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.xml",
+        "ref/dotnet/de/System.Threading.Thread.xml",
+        "ref/dotnet/es/System.Threading.Thread.xml",
+        "ref/dotnet/fr/System.Threading.Thread.xml",
+        "ref/dotnet/it/System.Threading.Thread.xml",
+        "ref/dotnet/ja/System.Threading.Thread.xml",
+        "ref/dotnet/ko/System.Threading.Thread.xml",
+        "ref/dotnet/ru/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hans/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hant/System.Threading.Thread.xml",
+        "ref/net46/System.Threading.Thread.dll"
+      ]
+    },
+    "System.Threading.ThreadPool/4.0.10-beta-23024": {
+      "sha512": "ue4+ZEycLk4N5plLhBySK7oQLE+XotooYRbZnfwrXK6s61n9K1O8q1glGt7o8QJZbTfVYEjRG0Tk0jocYaTa2A==",
+      "files": [
+        "System.Threading.ThreadPool.4.0.10-beta-23024.nupkg",
+        "System.Threading.ThreadPool.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.ThreadPool.nuspec",
+        "lib/DNXCore50/System.Threading.ThreadPool.dll",
+        "lib/net46/System.Threading.ThreadPool.dll",
+        "ref/dotnet/System.Threading.ThreadPool.dll",
+        "ref/dotnet/System.Threading.ThreadPool.xml",
+        "ref/dotnet/de/System.Threading.ThreadPool.xml",
+        "ref/dotnet/es/System.Threading.ThreadPool.xml",
+        "ref/dotnet/fr/System.Threading.ThreadPool.xml",
+        "ref/dotnet/it/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ja/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ko/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ru/System.Threading.ThreadPool.xml",
+        "ref/dotnet/zh-hans/System.Threading.ThreadPool.xml",
+        "ref/dotnet/zh-hant/System.Threading.ThreadPool.xml",
+        "ref/net46/System.Threading.ThreadPool.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Diagnostics.Process >= 4.0.0-beta-*",
+      "System.IO >= 4.0.10-beta-*",
+      "System.IO.FileSystem >= 4.0.0-beta-*",
+      "System.IO.FileSystem.Primitives >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Runtime.Handles >= 4.0.0-beta-*",
+      "System.Threading >= 4.0.0-beta-*",
+      "System.Globalization.Calendars >= 4.0.0-beta-*",
+      "System.Globalization >= 4.0.10-beta-*",
+      "System.Text.Encoding >= 4.0.10-beta-*",
+      "System.Runtime.InteropServices >= 4.0.20-beta-*",
+      "System.Collections >= 4.0.10-beta-*",
+      "System.Console >= 4.0.0-beta-*",
+      "System.Reflection >= 4.0.10-beta-*",
+      "System.Reflection.Primitives >= 4.0.0-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
index aca1e94..a09034b 100644 (file)
--- a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
+++ b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GenerateRunScript>false</GenerateRunScript>
   </PropertyGroup>
@@ -31,11 +31,11 @@
     <Compile Include="CoreclrTestWrapperLib.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
index ad828e8..22de3fb 100644 (file)
--- a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
+++ b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
@@ -20,7 +20,7 @@ namespace CoreclrTestLib
             System.IO.TextWriter err_file = new System.IO.StreamWriter(new FileStream(errorfile, FileMode.Create));
 
             int exitCode = -100;
-            int timeout = 1000 * 60*3;
+            int timeout = 1000 * 60*10;
             using (Process process = new Process())
             {
                 process.StartInfo.FileName = cmdLine;

diff --git a/tests/src/Common/Coreclr.TestWrapper/packages.config b/tests/src/Common/Coreclr.TestWrapper/packages.config
deleted file mode 100644 (file)
index 4ccf2c2..0000000
--- a/tests/src/Common/Coreclr.TestWrapper/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.Diagnostics.Process" version="4.0.0-beta-22412" />
-  <package id="System.IO" version="4.0.10-beta-22412" />
-  <package id="System.IO.FileSystem" version="4.0.0-beta-22412" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.0-beta-22412" />
-  <package id="System.Runtime" version="4.0.20-beta-22412" />
-  <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-  <package id="System.Runtime.Handles" version="4.0.0-beta-22412" />
-  <package id="System.Threading" version="4.0.0-beta-22412" />
-</packages>

diff --git a/tests/src/Common/Coreclr.TestWrapper/project.json b/tests/src/Common/Coreclr.TestWrapper/project.json
new file mode 100644 (file)
index 0000000..08cd22e
--- /dev/null
+++ b/tests/src/Common/Coreclr.TestWrapper/project.json
@@ -0,0 +1,15 @@
+{
+  "dependencies": {
+    "System.Diagnostics.Process": "4.0.0-beta-*",
+    "System.IO": "4.0.10-beta-*",
+    "System.IO.FileSystem": "4.0.0-beta-*",
+    "System.IO.FileSystem.Primitives": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Runtime.Handles": "4.0.0-beta-*",
+    "System.Threading": "4.0.0-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Common/Coreclr.TestWrapper/project.lock.json b/tests/src/Common/Coreclr.TestWrapper/project.lock.json
new file mode 100644 (file)
index 0000000..b3d436e
--- /dev/null
+++ b/tests/src/Common/Coreclr.TestWrapper/project.lock.json
@@ -0,0 +1,1001 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "Microsoft.Win32.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/Microsoft.Win32.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/Microsoft.Win32.Primitives.dll": {}
+        }
+      },
+      "Microsoft.Win32.Registry/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/Microsoft.Win32.Registry.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/Microsoft.Win32.Registry.dll": {}
+        }
+      },
+      "System.Collections/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Collections.dll": {}
+        }
+      },
+      "System.Diagnostics.Debug/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Debug.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Debug.dll": {}
+        }
+      },
+      "System.Diagnostics.Process/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.IO.FileSystem": "4.0.0-beta-23024",
+          "System.Security.SecureString": "4.0.0-beta-23024",
+          "Microsoft.Win32.Registry": "4.0.0-beta-23024",
+          "Microsoft.Win32.Primitives": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Threading.Thread": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Threading.ThreadPool": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Process.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Process.dll": {}
+        }
+      },
+      "System.Globalization/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Threading.Overlapped": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.FileSystem.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Security.Cryptography.Encryption/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Security.Cryptography.Encryption.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Security.Cryptography.Encryption.dll": {}
+        }
+      },
+      "System.Security.SecureString/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Security.Cryptography.Encryption": "4.0.0-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Security.SecureString.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Security.SecureString.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Overlapped/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Overlapped.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Overlapped.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Thread/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Thread.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Thread.dll": {}
+        }
+      },
+      "System.Threading.ThreadPool/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.InteropServices": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.ThreadPool.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.ThreadPool.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "Microsoft.Win32.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CILMy3sPDbjCjDhaP43dLVGD7E613CUVo7TpQGo2HjoG7Stv5JMiGsOJB3P4Mqymtb+P8FKYzchJwifCnO7cbw==",
+      "files": [
+        "Microsoft.Win32.Primitives.4.0.0-beta-23024.nupkg",
+        "Microsoft.Win32.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "Microsoft.Win32.Primitives.nuspec",
+        "lib/dotnet/Microsoft.Win32.Primitives.dll",
+        "lib/net46/Microsoft.Win32.Primitives.dll",
+        "ref/dotnet/Microsoft.Win32.Primitives.dll",
+        "ref/dotnet/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/de/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/es/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/fr/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/it/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/ja/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/ko/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/ru/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/zh-hans/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/zh-hant/Microsoft.Win32.Primitives.xml",
+        "ref/net46/Microsoft.Win32.Primitives.dll"
+      ]
+    },
+    "Microsoft.Win32.Registry/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CjFtCuQcX0BEo7gQaI7y+mHph+QTcQf1gQiVV6Pog4PNgjMUjoefF0xEEVEbxWKAVJ66Ugf2i6r+UG3pxoUTKA==",
+      "files": [
+        "Microsoft.Win32.Registry.4.0.0-beta-23024.nupkg",
+        "Microsoft.Win32.Registry.4.0.0-beta-23024.nupkg.sha512",
+        "Microsoft.Win32.Registry.nuspec",
+        "lib/DNXCore50/Microsoft.Win32.Registry.dll",
+        "lib/net46/Microsoft.Win32.Registry.dll",
+        "ref/dotnet/Microsoft.Win32.Registry.dll",
+        "ref/dotnet/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/de/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/es/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/fr/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/it/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/ja/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/ko/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/ru/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/zh-hans/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/zh-hant/Microsoft.Win32.Registry.xml",
+        "ref/net46/Microsoft.Win32.Registry.dll"
+      ]
+    },
+    "System.Collections/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "2ISUf3MQt7JbeT6kXg36qY3fnkjykPXccHcBP0qyTc5vEjbLihC7KCxkHPFJWteKR8lvvSF3+8ES5J34VqezmQ==",
+      "files": [
+        "System.Collections.4.0.10-beta-23024.nupkg",
+        "System.Collections.4.0.10-beta-23024.nupkg.sha512",
+        "System.Collections.nuspec",
+        "lib/DNXCore50/System.Collections.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Collections.dll",
+        "ref/dotnet/System.Collections.dll",
+        "ref/dotnet/System.Collections.xml",
+        "ref/dotnet/de/System.Collections.xml",
+        "ref/dotnet/es/System.Collections.xml",
+        "ref/dotnet/fr/System.Collections.xml",
+        "ref/dotnet/it/System.Collections.xml",
+        "ref/dotnet/ja/System.Collections.xml",
+        "ref/dotnet/ko/System.Collections.xml",
+        "ref/dotnet/ru/System.Collections.xml",
+        "ref/dotnet/zh-hans/System.Collections.xml",
+        "ref/dotnet/zh-hant/System.Collections.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Collections.dll"
+      ]
+    },
+    "System.Diagnostics.Debug/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "dnfynhlmsMaRB/YvN5JifCdYYnRf/mTjFAAM1awp3wrjsgOSpAzOE4sxYX0hdY1FyAFTDcUnusQ+H3AMcF3Stw==",
+      "files": [
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg",
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Debug.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Debug.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.xml",
+        "ref/dotnet/de/System.Diagnostics.Debug.xml",
+        "ref/dotnet/es/System.Diagnostics.Debug.xml",
+        "ref/dotnet/fr/System.Diagnostics.Debug.xml",
+        "ref/dotnet/it/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ja/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ko/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ru/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Debug.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Debug.dll"
+      ]
+    },
+    "System.Diagnostics.Process/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "tcEFjAg6pxyviDO0FSSnhauEyxV/dfm5MbbS4cBG4hIYYcI3TuH8+pFm8oWwGl3WoJlL2WrN5QySwDON0z6OKQ==",
+      "files": [
+        "System.Diagnostics.Process.4.0.0-beta-23024.nupkg",
+        "System.Diagnostics.Process.4.0.0-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Process.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Process.dll",
+        "lib/net46/System.Diagnostics.Process.dll",
+        "ref/dotnet/System.Diagnostics.Process.dll",
+        "ref/dotnet/System.Diagnostics.Process.xml",
+        "ref/dotnet/de/System.Diagnostics.Process.xml",
+        "ref/dotnet/es/System.Diagnostics.Process.xml",
+        "ref/dotnet/fr/System.Diagnostics.Process.xml",
+        "ref/dotnet/it/System.Diagnostics.Process.xml",
+        "ref/dotnet/ja/System.Diagnostics.Process.xml",
+        "ref/dotnet/ko/System.Diagnostics.Process.xml",
+        "ref/dotnet/ru/System.Diagnostics.Process.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Process.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Process.xml",
+        "ref/net46/System.Diagnostics.Process.dll"
+      ]
+    },
+    "System.Globalization/4.0.10-beta-23024": {
+      "sha512": "RROZnwQ8phf5Sbb6h8rdnQCoppfKdWKmQ4CiWfvpbRG5XwWbVrMyZsBYazLTQ59MFXe8RXYHgHvE9OfnZPTCLQ==",
+      "files": [
+        "System.Globalization.4.0.10-beta-23024.nupkg",
+        "System.Globalization.4.0.10-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/DNXCore50/System.Globalization.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Globalization.dll"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CUlwZ5kM4QRQgsVj9/QQIr86hLr7U/E6evFXg6643qd63BppdfORu46tyQMxS/gsdrT4PiIRu7rrrguXiBR5ww==",
+      "files": [
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.nuspec",
+        "lib/DNXCore50/System.IO.FileSystem.dll",
+        "lib/net46/System.IO.FileSystem.dll",
+        "lib/netcore50/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.xml",
+        "ref/dotnet/de/System.IO.FileSystem.xml",
+        "ref/dotnet/es/System.IO.FileSystem.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.xml",
+        "ref/dotnet/it/System.IO.FileSystem.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.xml",
+        "ref/net46/System.IO.FileSystem.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Security.Cryptography.Encryption/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "LGHXdvs2WCJjLSKuvn+0SDZhevPyaHNwHx3BiojKsCYPfP3RmTqVMWAAn/tGpn18zV6E1TWGhuJt8xWtbjJk0Q==",
+      "files": [
+        "System.Security.Cryptography.Encryption.4.0.0-beta-23024.nupkg",
+        "System.Security.Cryptography.Encryption.4.0.0-beta-23024.nupkg.sha512",
+        "System.Security.Cryptography.Encryption.nuspec",
+        "lib/DNXCore50/System.Security.Cryptography.Encryption.dll",
+        "lib/net46/System.Security.Cryptography.Encryption.dll",
+        "ref/dotnet/System.Security.Cryptography.Encryption.dll",
+        "ref/dotnet/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/de/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/es/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/fr/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/it/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/ja/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/ko/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/ru/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/zh-hans/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/zh-hant/System.Security.Cryptography.Encryption.xml",
+        "ref/net46/System.Security.Cryptography.Encryption.dll"
+      ]
+    },
+    "System.Security.SecureString/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "Spz5h3BDm58mpoQp/KkZ0y6UEeNSnpNqqxEZ+ZIDQElHd/gWugPEVooKWLi8PwIh+J1gzoD298lsaKUO2Y6Opg==",
+      "files": [
+        "System.Security.SecureString.4.0.0-beta-23024.nupkg",
+        "System.Security.SecureString.4.0.0-beta-23024.nupkg.sha512",
+        "System.Security.SecureString.nuspec",
+        "lib/DNXCore50/System.Security.SecureString.dll",
+        "lib/net46/System.Security.SecureString.dll",
+        "ref/dotnet/System.Security.SecureString.dll",
+        "ref/dotnet/System.Security.SecureString.xml",
+        "ref/dotnet/de/System.Security.SecureString.xml",
+        "ref/dotnet/es/System.Security.SecureString.xml",
+        "ref/dotnet/fr/System.Security.SecureString.xml",
+        "ref/dotnet/it/System.Security.SecureString.xml",
+        "ref/dotnet/ja/System.Security.SecureString.xml",
+        "ref/dotnet/ko/System.Security.SecureString.xml",
+        "ref/dotnet/ru/System.Security.SecureString.xml",
+        "ref/dotnet/zh-hans/System.Security.SecureString.xml",
+        "ref/dotnet/zh-hant/System.Security.SecureString.xml",
+        "ref/net46/System.Security.SecureString.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Overlapped/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "i5FkjE3Y++zufCyS68xiq8t/lwPyS2+urpv0MZUOID0pggCpqJiUGV5bnJRBo9Da79rpnVeFBleDOVFCnr2lrw==",
+      "files": [
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg",
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Overlapped.nuspec",
+        "lib/DNXCore50/System.Threading.Overlapped.dll",
+        "lib/net46/System.Threading.Overlapped.dll",
+        "lib/netcore50/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.xml",
+        "ref/dotnet/de/System.Threading.Overlapped.xml",
+        "ref/dotnet/es/System.Threading.Overlapped.xml",
+        "ref/dotnet/fr/System.Threading.Overlapped.xml",
+        "ref/dotnet/it/System.Threading.Overlapped.xml",
+        "ref/dotnet/ja/System.Threading.Overlapped.xml",
+        "ref/dotnet/ko/System.Threading.Overlapped.xml",
+        "ref/dotnet/ru/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hans/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hant/System.Threading.Overlapped.xml",
+        "ref/net46/System.Threading.Overlapped.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Thread/4.0.0-beta-23024": {
+      "sha512": "aeok537DgipEVRaoFjfYFf5MAyKm6eXKQQibvvHDertRXx+h1a7sIxt+K9QEHbjxDeKC+06orbGMlasNPSLxHA==",
+      "files": [
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg",
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Thread.nuspec",
+        "lib/DNXCore50/System.Threading.Thread.dll",
+        "lib/net46/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.xml",
+        "ref/dotnet/de/System.Threading.Thread.xml",
+        "ref/dotnet/es/System.Threading.Thread.xml",
+        "ref/dotnet/fr/System.Threading.Thread.xml",
+        "ref/dotnet/it/System.Threading.Thread.xml",
+        "ref/dotnet/ja/System.Threading.Thread.xml",
+        "ref/dotnet/ko/System.Threading.Thread.xml",
+        "ref/dotnet/ru/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hans/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hant/System.Threading.Thread.xml",
+        "ref/net46/System.Threading.Thread.dll"
+      ]
+    },
+    "System.Threading.ThreadPool/4.0.10-beta-23024": {
+      "sha512": "ue4+ZEycLk4N5plLhBySK7oQLE+XotooYRbZnfwrXK6s61n9K1O8q1glGt7o8QJZbTfVYEjRG0Tk0jocYaTa2A==",
+      "files": [
+        "System.Threading.ThreadPool.4.0.10-beta-23024.nupkg",
+        "System.Threading.ThreadPool.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.ThreadPool.nuspec",
+        "lib/DNXCore50/System.Threading.ThreadPool.dll",
+        "lib/net46/System.Threading.ThreadPool.dll",
+        "ref/dotnet/System.Threading.ThreadPool.dll",
+        "ref/dotnet/System.Threading.ThreadPool.xml",
+        "ref/dotnet/de/System.Threading.ThreadPool.xml",
+        "ref/dotnet/es/System.Threading.ThreadPool.xml",
+        "ref/dotnet/fr/System.Threading.ThreadPool.xml",
+        "ref/dotnet/it/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ja/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ko/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ru/System.Threading.ThreadPool.xml",
+        "ref/dotnet/zh-hans/System.Threading.ThreadPool.xml",
+        "ref/dotnet/zh-hant/System.Threading.ThreadPool.xml",
+        "ref/net46/System.Threading.ThreadPool.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Diagnostics.Process >= 4.0.0-beta-*",
+      "System.IO >= 4.0.10-beta-*",
+      "System.IO.FileSystem >= 4.0.0-beta-*",
+      "System.IO.FileSystem.Primitives >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Runtime.Handles >= 4.0.0-beta-*",
+      "System.Threading >= 4.0.0-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj b/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj
index 943391e..b7e61ef 100644 (file)
--- a/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj
+++ b/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.common.props))\dir.common.props" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,7 +8,9 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Coreclr.TestWrapper</RootNamespace>
     <AssemblyName>Coreclr.TestWrapper</AssemblyName>
+    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <SkipSigning>true</SkipSigning>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -31,16 +32,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="mscorlib" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Coreclr.TestWrapper\CoreclrTestWrapperLib.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>

diff --git a/tests/src/Exceptions/Finalization/Finalizer.csproj b/tests/src/Exceptions/Finalization/Finalizer.csproj
index 75d8b8a..c7f722f 100644 (file)
--- a/tests/src/Exceptions/Finalization/Finalizer.csproj
+++ b/tests/src/Exceptions/Finalization/Finalizer.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
@@ -31,11 +31,10 @@
     <Compile Include="Finalizer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Exceptions/Finalization/app.config b/tests/src/Exceptions/Finalization/app.config
deleted file mode 100644 (file)
index 62803f5..0000000
--- a/tests/src/Exceptions/Finalization/app.config
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.20.0" newVersion="4.0.20.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Text.Encoding" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IO" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file

diff --git a/tests/src/Exceptions/Finalization/packages.config b/tests/src/Exceptions/Finalization/packages.config
deleted file mode 100644 (file)
index 62d801f..0000000
--- a/tests/src/Exceptions/Finalization/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-</packages>

diff --git a/tests/src/Exceptions/Finalization/project.json b/tests/src/Exceptions/Finalization/project.json
new file mode 100644 (file)
index 0000000..47433cd
--- /dev/null
+++ b/tests/src/Exceptions/Finalization/project.json
@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Exceptions/Finalization/project.lock.json b/tests/src/Exceptions/Finalization/project.lock.json
new file mode 100644 (file)
index 0000000..9eb613b
--- /dev/null
+++ b/tests/src/Exceptions/Finalization/project.lock.json
@@ -0,0 +1,575 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "uoRg44bzPk9KE9Sg6rLZmGfUmFZBDc7y25692VYna/WW3Smip/aGX0ESXyuNvWA8k8oXdV4Z/M4ZKdB3ahtdDw==",
+      "files": [
+        "System.Threading.4.0.10-beta-23024.nupkg",
+        "System.Threading.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/DNXCore50/System.Threading.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.dll",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj b/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj
index 89ba975..347f5cd 100644 (file)
--- a/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj
+++ b/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +14,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <!--This test is to be run manually for now -->
@@ -31,7 +32,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DetourHelpers.cs" />
-    <Compile Include="key_v1.cs" />
     <Compile Include="LoaderClass.cs" />
     <Compile Include="ReliabilityConfiguration.cs" />
     <Compile Include="ReliabilityFramework.cs" />
@@ -40,8 +40,8 @@
     <Compile Include="RFLogging.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
@@ -51,7 +51,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <Target Name="AfterBuild">
     <MSBuild Projects="..\Tests\GC_Stress_tests_collection.csproj" />
     <MakeDir Directories="$(OutDir)\Tests" />
@@ -60,4 +59,4 @@
     </ItemGroup>
     <Copy SourceFiles="@(TestExesToCopy)" DestinationFolder="$(OutDir)\Tests" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/GC/Stress/Framework/key_v1.cs b/tests/src/GC/Stress/Framework/key_v1.cs
deleted file mode 100644 (file)
index 814431f..0000000
--- a/tests/src/GC/Stress/Framework/key_v1.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using System;
-using System.Reflection;
-
-[assembly:AssemblyVersionAttribute("1.0.0.0")]
-

diff --git a/tests/src/GC/Stress/Framework/packages.config b/tests/src/GC/Stress/Framework/packages.config
deleted file mode 100644 (file)
index c9893f3..0000000
--- a/tests/src/GC/Stress/Framework/packages.config
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.Collections" version="4.0.10-beta-22412" />
-  <package id="System.Collections.NonGeneric" version="4.0.0-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Console" version="4.0.0-beta-22405" />
-  <package id="System.Diagnostics.Debug" version="4.0.10-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Diagnostics.Process" version="4.0.0-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Globalization" version="4.0.10-beta-22412" targetFramework="portable-net45+win" />
-  <package id="System.IO" version="4.0.10-beta-22412" targetFramework="portable-net45+win" />
-  <package id="System.IO.FileSystem" version="4.0.0-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.0-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Linq" version="4.0.0-beta-22412" />
-  <package id="System.Reflection" version="4.0.10-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Reflection.Primitives" version="4.0.0-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Reflection.TypeExtensions" version="4.0.0-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Runtime" version="4.0.20-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-  <package id="System.Runtime.Handles" version="4.0.0-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Runtime.InteropServices" version="4.0.20-beta-22412" />
-  <package id="System.Runtime.Loader" version="4.0.0-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Text.Encoding" version="4.0.10-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Text.Encoding.Extensions" version="4.0.10-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Threading" version="4.0.0-beta-22412" />
-  <package id="System.Threading.Tasks" version="4.0.10-beta-22412" targetFramework="portable-net45+win" />
-  <package id="System.Threading.Thread" version="4.0.0-beta-22512" />
-  <package id="System.Xml.ReaderWriter" version="4.0.10-beta-22512" targetFramework="portable-net45+win" />
-</packages>

diff --git a/tests/src/GC/Stress/Framework/project.json b/tests/src/GC/Stress/Framework/project.json
new file mode 100644 (file)
index 0000000..e9250b2
--- /dev/null
+++ b/tests/src/GC/Stress/Framework/project.json
@@ -0,0 +1,31 @@
+{
+  "dependencies": {
+    "System.Collections": "4.0.10-beta-*",
+    "System.Collections.NonGeneric": "4.0.0-beta-*",
+    "System.Console": "4.0.0-beta-*",
+    "System.Diagnostics.Debug": "4.0.10-beta-*",
+    "System.Diagnostics.Process": "4.0.0-beta-*",
+    "System.Globalization": "4.0.10-beta-*",
+    "System.IO": "4.0.10-beta-*",
+    "System.IO.FileSystem": "4.0.0-beta-*",
+    "System.IO.FileSystem.Primitives": "4.0.0-beta-*",
+    "System.Linq": "4.0.0-beta-*",
+    "System.Reflection": "4.0.10-beta-*",
+    "System.Reflection.Primitives": "4.0.0-beta-*",
+    "System.Reflection.TypeExtensions": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Runtime.Handles": "4.0.0-beta-*",
+    "System.Runtime.InteropServices": "4.0.20-beta-*",
+    "System.Runtime.Loader": "4.0.0-beta-*",
+    "System.Text.Encoding": "4.0.10-beta-*",
+    "System.Text.Encoding.Extensions": "4.0.10-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+    "System.Threading.Tasks": "4.0.10-beta-*",
+    "System.Threading.Thread": "4.0.0-beta-*",
+    "System.Xml.ReaderWriter": "4.0.10-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/GC/Stress/Framework/project.lock.json b/tests/src/GC/Stress/Framework/project.lock.json
new file mode 100644 (file)
index 0000000..6ec8348
--- /dev/null
+++ b/tests/src/GC/Stress/Framework/project.lock.json
@@ -0,0 +1,1289 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "Microsoft.Win32.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/Microsoft.Win32.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/Microsoft.Win32.Primitives.dll": {}
+        }
+      },
+      "Microsoft.Win32.Registry/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/Microsoft.Win32.Registry.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/Microsoft.Win32.Registry.dll": {}
+        }
+      },
+      "System.Collections/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Collections.dll": {}
+        }
+      },
+      "System.Collections.NonGeneric/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.NonGeneric.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Collections.NonGeneric.dll": {}
+        }
+      },
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Diagnostics.Debug/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Debug.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Debug.dll": {}
+        }
+      },
+      "System.Diagnostics.Process/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.IO.FileSystem": "4.0.0-beta-23024",
+          "System.Security.SecureString": "4.0.0-beta-23024",
+          "Microsoft.Win32.Registry": "4.0.0-beta-23024",
+          "Microsoft.Win32.Primitives": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Threading.Thread": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Threading.ThreadPool": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Process.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Process.dll": {}
+        }
+      },
+      "System.Globalization/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Threading.Overlapped": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.FileSystem.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Linq/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Linq.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Linq.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Reflection.TypeExtensions/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.TypeExtensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.TypeExtensions.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Runtime.Loader/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.IO": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Loader.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Loader.dll": {}
+        }
+      },
+      "System.Security.Cryptography.Encryption/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Security.Cryptography.Encryption.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Security.Cryptography.Encryption.dll": {}
+        }
+      },
+      "System.Security.SecureString/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Security.Cryptography.Encryption": "4.0.0-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Security.SecureString.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Security.SecureString.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Text.RegularExpressions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.RegularExpressions.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Text.RegularExpressions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Overlapped/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Overlapped.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Overlapped.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Thread/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Thread.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Thread.dll": {}
+        }
+      },
+      "System.Threading.ThreadPool/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.InteropServices": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.ThreadPool.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.ThreadPool.dll": {}
+        }
+      },
+      "System.Xml.ReaderWriter/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Text.RegularExpressions": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Xml.ReaderWriter.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Xml.ReaderWriter.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "Microsoft.Win32.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CILMy3sPDbjCjDhaP43dLVGD7E613CUVo7TpQGo2HjoG7Stv5JMiGsOJB3P4Mqymtb+P8FKYzchJwifCnO7cbw==",
+      "files": [
+        "Microsoft.Win32.Primitives.4.0.0-beta-23024.nupkg",
+        "Microsoft.Win32.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "Microsoft.Win32.Primitives.nuspec",
+        "lib/dotnet/Microsoft.Win32.Primitives.dll",
+        "lib/net46/Microsoft.Win32.Primitives.dll",
+        "ref/dotnet/Microsoft.Win32.Primitives.dll",
+        "ref/dotnet/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/de/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/es/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/fr/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/it/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/ja/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/ko/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/ru/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/zh-hans/Microsoft.Win32.Primitives.xml",
+        "ref/dotnet/zh-hant/Microsoft.Win32.Primitives.xml",
+        "ref/net46/Microsoft.Win32.Primitives.dll"
+      ]
+    },
+    "Microsoft.Win32.Registry/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CjFtCuQcX0BEo7gQaI7y+mHph+QTcQf1gQiVV6Pog4PNgjMUjoefF0xEEVEbxWKAVJ66Ugf2i6r+UG3pxoUTKA==",
+      "files": [
+        "Microsoft.Win32.Registry.4.0.0-beta-23024.nupkg",
+        "Microsoft.Win32.Registry.4.0.0-beta-23024.nupkg.sha512",
+        "Microsoft.Win32.Registry.nuspec",
+        "lib/DNXCore50/Microsoft.Win32.Registry.dll",
+        "lib/net46/Microsoft.Win32.Registry.dll",
+        "ref/dotnet/Microsoft.Win32.Registry.dll",
+        "ref/dotnet/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/de/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/es/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/fr/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/it/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/ja/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/ko/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/ru/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/zh-hans/Microsoft.Win32.Registry.xml",
+        "ref/dotnet/zh-hant/Microsoft.Win32.Registry.xml",
+        "ref/net46/Microsoft.Win32.Registry.dll"
+      ]
+    },
+    "System.Collections/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "2ISUf3MQt7JbeT6kXg36qY3fnkjykPXccHcBP0qyTc5vEjbLihC7KCxkHPFJWteKR8lvvSF3+8ES5J34VqezmQ==",
+      "files": [
+        "System.Collections.4.0.10-beta-23024.nupkg",
+        "System.Collections.4.0.10-beta-23024.nupkg.sha512",
+        "System.Collections.nuspec",
+        "lib/DNXCore50/System.Collections.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Collections.dll",
+        "ref/dotnet/System.Collections.dll",
+        "ref/dotnet/System.Collections.xml",
+        "ref/dotnet/de/System.Collections.xml",
+        "ref/dotnet/es/System.Collections.xml",
+        "ref/dotnet/fr/System.Collections.xml",
+        "ref/dotnet/it/System.Collections.xml",
+        "ref/dotnet/ja/System.Collections.xml",
+        "ref/dotnet/ko/System.Collections.xml",
+        "ref/dotnet/ru/System.Collections.xml",
+        "ref/dotnet/zh-hans/System.Collections.xml",
+        "ref/dotnet/zh-hant/System.Collections.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Collections.dll"
+      ]
+    },
+    "System.Collections.NonGeneric/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "Jd4spE+ne509ci1FnwnyOhCP86njatVRlxTBRfzP3gyRjMUkcY7su5Qgtu6yc9b0equR7CjRU8P++sYS6szZ9A==",
+      "files": [
+        "System.Collections.NonGeneric.4.0.0-beta-23024.nupkg",
+        "System.Collections.NonGeneric.4.0.0-beta-23024.nupkg.sha512",
+        "System.Collections.NonGeneric.nuspec",
+        "lib/dotnet/System.Collections.NonGeneric.dll",
+        "lib/net46/System.Collections.NonGeneric.dll",
+        "ref/dotnet/System.Collections.NonGeneric.dll",
+        "ref/dotnet/System.Collections.NonGeneric.xml",
+        "ref/dotnet/de/System.Collections.NonGeneric.xml",
+        "ref/dotnet/es/System.Collections.NonGeneric.xml",
+        "ref/dotnet/fr/System.Collections.NonGeneric.xml",
+        "ref/dotnet/it/System.Collections.NonGeneric.xml",
+        "ref/dotnet/ja/System.Collections.NonGeneric.xml",
+        "ref/dotnet/ko/System.Collections.NonGeneric.xml",
+        "ref/dotnet/ru/System.Collections.NonGeneric.xml",
+        "ref/dotnet/zh-hans/System.Collections.NonGeneric.xml",
+        "ref/dotnet/zh-hant/System.Collections.NonGeneric.xml",
+        "ref/net46/System.Collections.NonGeneric.dll"
+      ]
+    },
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Diagnostics.Debug/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "dnfynhlmsMaRB/YvN5JifCdYYnRf/mTjFAAM1awp3wrjsgOSpAzOE4sxYX0hdY1FyAFTDcUnusQ+H3AMcF3Stw==",
+      "files": [
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg",
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Debug.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Debug.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.xml",
+        "ref/dotnet/de/System.Diagnostics.Debug.xml",
+        "ref/dotnet/es/System.Diagnostics.Debug.xml",
+        "ref/dotnet/fr/System.Diagnostics.Debug.xml",
+        "ref/dotnet/it/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ja/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ko/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ru/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Debug.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Debug.dll"
+      ]
+    },
+    "System.Diagnostics.Process/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "tcEFjAg6pxyviDO0FSSnhauEyxV/dfm5MbbS4cBG4hIYYcI3TuH8+pFm8oWwGl3WoJlL2WrN5QySwDON0z6OKQ==",
+      "files": [
+        "System.Diagnostics.Process.4.0.0-beta-23024.nupkg",
+        "System.Diagnostics.Process.4.0.0-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Process.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Process.dll",
+        "lib/net46/System.Diagnostics.Process.dll",
+        "ref/dotnet/System.Diagnostics.Process.dll",
+        "ref/dotnet/System.Diagnostics.Process.xml",
+        "ref/dotnet/de/System.Diagnostics.Process.xml",
+        "ref/dotnet/es/System.Diagnostics.Process.xml",
+        "ref/dotnet/fr/System.Diagnostics.Process.xml",
+        "ref/dotnet/it/System.Diagnostics.Process.xml",
+        "ref/dotnet/ja/System.Diagnostics.Process.xml",
+        "ref/dotnet/ko/System.Diagnostics.Process.xml",
+        "ref/dotnet/ru/System.Diagnostics.Process.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Process.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Process.xml",
+        "ref/net46/System.Diagnostics.Process.dll"
+      ]
+    },
+    "System.Globalization/4.0.10-beta-23024": {
+      "sha512": "RROZnwQ8phf5Sbb6h8rdnQCoppfKdWKmQ4CiWfvpbRG5XwWbVrMyZsBYazLTQ59MFXe8RXYHgHvE9OfnZPTCLQ==",
+      "files": [
+        "System.Globalization.4.0.10-beta-23024.nupkg",
+        "System.Globalization.4.0.10-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/DNXCore50/System.Globalization.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Globalization.dll"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CUlwZ5kM4QRQgsVj9/QQIr86hLr7U/E6evFXg6643qd63BppdfORu46tyQMxS/gsdrT4PiIRu7rrrguXiBR5ww==",
+      "files": [
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.nuspec",
+        "lib/DNXCore50/System.IO.FileSystem.dll",
+        "lib/net46/System.IO.FileSystem.dll",
+        "lib/netcore50/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.xml",
+        "ref/dotnet/de/System.IO.FileSystem.xml",
+        "ref/dotnet/es/System.IO.FileSystem.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.xml",
+        "ref/dotnet/it/System.IO.FileSystem.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.xml",
+        "ref/net46/System.IO.FileSystem.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Linq/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "hVGW083n8Lf5J0uFrDqbbeZODqcpqlTls42aVbJXkELEBfRFOYdC3elpPEw/gtlLsBIUFfYJgq+a/7Mqv/i//g==",
+      "files": [
+        "System.Linq.4.0.0-beta-23024.nupkg",
+        "System.Linq.4.0.0-beta-23024.nupkg.sha512",
+        "System.Linq.nuspec",
+        "lib/dotnet/System.Linq.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Linq.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Linq.dll",
+        "ref/dotnet/System.Linq.xml",
+        "ref/dotnet/de/System.Linq.xml",
+        "ref/dotnet/es/System.Linq.xml",
+        "ref/dotnet/fr/System.Linq.xml",
+        "ref/dotnet/it/System.Linq.xml",
+        "ref/dotnet/ja/System.Linq.xml",
+        "ref/dotnet/ko/System.Linq.xml",
+        "ref/dotnet/ru/System.Linq.xml",
+        "ref/dotnet/zh-hans/System.Linq.xml",
+        "ref/dotnet/zh-hant/System.Linq.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Linq.dll",
+        "ref/netcore50/System.Linq.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.10-beta-23024": {
+      "sha512": "Ky5yclJBgNu+NArFSblpe2FZ/IeLeOYLIP8hLBwTiVDRufjWDqPKcPtETfnmyZq61HGyhTJWFd1uEkhDOgxF9g==",
+      "files": [
+        "System.Reflection.4.0.10-beta-23024.nupkg",
+        "System.Reflection.4.0.10-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/DNXCore50/System.Reflection.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.dll"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Reflection.TypeExtensions/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UTsspl61Om2E/x08euAQIrf5d6ebbx4YB8iLvtUrgYBV/iia81X6yMiRobUfYSNKu7WVAxwVrzxyPM8gDaA0rA==",
+      "files": [
+        "System.Reflection.TypeExtensions.4.0.0-beta-23024.nupkg",
+        "System.Reflection.TypeExtensions.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.TypeExtensions.nuspec",
+        "lib/DNXCore50/System.Reflection.TypeExtensions.dll",
+        "lib/net46/System.Reflection.TypeExtensions.dll",
+        "lib/netcore50/System.Reflection.TypeExtensions.dll",
+        "ref/dotnet/System.Reflection.TypeExtensions.dll",
+        "ref/dotnet/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/de/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/es/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/fr/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/it/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/ja/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/ko/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/ru/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/zh-hans/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/zh-hant/System.Reflection.TypeExtensions.xml",
+        "ref/net46/System.Reflection.TypeExtensions.dll",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.TypeExtensions.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Runtime.Loader/4.0.0-beta-23024": {
+      "sha512": "b2i7rlQtpmm/woDbl0OdLBdHrIkR7fWk9z36iqmDQ2FNUFV3qvyQU2GLEmdBiNajc7a+dE+5laT5v704LZ1Xew==",
+      "files": [
+        "System.Runtime.Loader.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Loader.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Loader.nuspec",
+        "lib/DNXCore50/System.Runtime.Loader.dll",
+        "ref/dotnet/System.Runtime.Loader.dll",
+        "ref/dotnet/System.Runtime.Loader.xml",
+        "ref/dotnet/de/System.Runtime.Loader.xml",
+        "ref/dotnet/es/System.Runtime.Loader.xml",
+        "ref/dotnet/fr/System.Runtime.Loader.xml",
+        "ref/dotnet/it/System.Runtime.Loader.xml",
+        "ref/dotnet/ja/System.Runtime.Loader.xml",
+        "ref/dotnet/ko/System.Runtime.Loader.xml",
+        "ref/dotnet/ru/System.Runtime.Loader.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Loader.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Loader.xml"
+      ]
+    },
+    "System.Security.Cryptography.Encryption/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "LGHXdvs2WCJjLSKuvn+0SDZhevPyaHNwHx3BiojKsCYPfP3RmTqVMWAAn/tGpn18zV6E1TWGhuJt8xWtbjJk0Q==",
+      "files": [
+        "System.Security.Cryptography.Encryption.4.0.0-beta-23024.nupkg",
+        "System.Security.Cryptography.Encryption.4.0.0-beta-23024.nupkg.sha512",
+        "System.Security.Cryptography.Encryption.nuspec",
+        "lib/DNXCore50/System.Security.Cryptography.Encryption.dll",
+        "lib/net46/System.Security.Cryptography.Encryption.dll",
+        "ref/dotnet/System.Security.Cryptography.Encryption.dll",
+        "ref/dotnet/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/de/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/es/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/fr/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/it/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/ja/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/ko/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/ru/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/zh-hans/System.Security.Cryptography.Encryption.xml",
+        "ref/dotnet/zh-hant/System.Security.Cryptography.Encryption.xml",
+        "ref/net46/System.Security.Cryptography.Encryption.dll"
+      ]
+    },
+    "System.Security.SecureString/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "Spz5h3BDm58mpoQp/KkZ0y6UEeNSnpNqqxEZ+ZIDQElHd/gWugPEVooKWLi8PwIh+J1gzoD298lsaKUO2Y6Opg==",
+      "files": [
+        "System.Security.SecureString.4.0.0-beta-23024.nupkg",
+        "System.Security.SecureString.4.0.0-beta-23024.nupkg.sha512",
+        "System.Security.SecureString.nuspec",
+        "lib/DNXCore50/System.Security.SecureString.dll",
+        "lib/net46/System.Security.SecureString.dll",
+        "ref/dotnet/System.Security.SecureString.dll",
+        "ref/dotnet/System.Security.SecureString.xml",
+        "ref/dotnet/de/System.Security.SecureString.xml",
+        "ref/dotnet/es/System.Security.SecureString.xml",
+        "ref/dotnet/fr/System.Security.SecureString.xml",
+        "ref/dotnet/it/System.Security.SecureString.xml",
+        "ref/dotnet/ja/System.Security.SecureString.xml",
+        "ref/dotnet/ko/System.Security.SecureString.xml",
+        "ref/dotnet/ru/System.Security.SecureString.xml",
+        "ref/dotnet/zh-hans/System.Security.SecureString.xml",
+        "ref/dotnet/zh-hant/System.Security.SecureString.xml",
+        "ref/net46/System.Security.SecureString.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Text.RegularExpressions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "dbbYvJczIWGYK4UChCYn6ZsBeRWXIA8UJAPaY8ovsNeP5pCGCLRVRPYnmk2oky5+18fwYy0gEArMF8szyRVHOg==",
+      "files": [
+        "System.Text.RegularExpressions.4.0.10-beta-23024.nupkg",
+        "System.Text.RegularExpressions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.RegularExpressions.nuspec",
+        "lib/dotnet/System.Text.RegularExpressions.dll",
+        "lib/net46/_._",
+        "ref/dotnet/System.Text.RegularExpressions.dll",
+        "ref/dotnet/System.Text.RegularExpressions.xml",
+        "ref/dotnet/de/System.Text.RegularExpressions.xml",
+        "ref/dotnet/es/System.Text.RegularExpressions.xml",
+        "ref/dotnet/fr/System.Text.RegularExpressions.xml",
+        "ref/dotnet/it/System.Text.RegularExpressions.xml",
+        "ref/dotnet/ja/System.Text.RegularExpressions.xml",
+        "ref/dotnet/ko/System.Text.RegularExpressions.xml",
+        "ref/dotnet/ru/System.Text.RegularExpressions.xml",
+        "ref/dotnet/zh-hans/System.Text.RegularExpressions.xml",
+        "ref/dotnet/zh-hant/System.Text.RegularExpressions.xml",
+        "ref/net46/_._"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Overlapped/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "i5FkjE3Y++zufCyS68xiq8t/lwPyS2+urpv0MZUOID0pggCpqJiUGV5bnJRBo9Da79rpnVeFBleDOVFCnr2lrw==",
+      "files": [
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg",
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Overlapped.nuspec",
+        "lib/DNXCore50/System.Threading.Overlapped.dll",
+        "lib/net46/System.Threading.Overlapped.dll",
+        "lib/netcore50/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.xml",
+        "ref/dotnet/de/System.Threading.Overlapped.xml",
+        "ref/dotnet/es/System.Threading.Overlapped.xml",
+        "ref/dotnet/fr/System.Threading.Overlapped.xml",
+        "ref/dotnet/it/System.Threading.Overlapped.xml",
+        "ref/dotnet/ja/System.Threading.Overlapped.xml",
+        "ref/dotnet/ko/System.Threading.Overlapped.xml",
+        "ref/dotnet/ru/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hans/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hant/System.Threading.Overlapped.xml",
+        "ref/net46/System.Threading.Overlapped.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Thread/4.0.0-beta-23024": {
+      "sha512": "aeok537DgipEVRaoFjfYFf5MAyKm6eXKQQibvvHDertRXx+h1a7sIxt+K9QEHbjxDeKC+06orbGMlasNPSLxHA==",
+      "files": [
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg",
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Thread.nuspec",
+        "lib/DNXCore50/System.Threading.Thread.dll",
+        "lib/net46/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.xml",
+        "ref/dotnet/de/System.Threading.Thread.xml",
+        "ref/dotnet/es/System.Threading.Thread.xml",
+        "ref/dotnet/fr/System.Threading.Thread.xml",
+        "ref/dotnet/it/System.Threading.Thread.xml",
+        "ref/dotnet/ja/System.Threading.Thread.xml",
+        "ref/dotnet/ko/System.Threading.Thread.xml",
+        "ref/dotnet/ru/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hans/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hant/System.Threading.Thread.xml",
+        "ref/net46/System.Threading.Thread.dll"
+      ]
+    },
+    "System.Threading.ThreadPool/4.0.10-beta-23024": {
+      "sha512": "ue4+ZEycLk4N5plLhBySK7oQLE+XotooYRbZnfwrXK6s61n9K1O8q1glGt7o8QJZbTfVYEjRG0Tk0jocYaTa2A==",
+      "files": [
+        "System.Threading.ThreadPool.4.0.10-beta-23024.nupkg",
+        "System.Threading.ThreadPool.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.ThreadPool.nuspec",
+        "lib/DNXCore50/System.Threading.ThreadPool.dll",
+        "lib/net46/System.Threading.ThreadPool.dll",
+        "ref/dotnet/System.Threading.ThreadPool.dll",
+        "ref/dotnet/System.Threading.ThreadPool.xml",
+        "ref/dotnet/de/System.Threading.ThreadPool.xml",
+        "ref/dotnet/es/System.Threading.ThreadPool.xml",
+        "ref/dotnet/fr/System.Threading.ThreadPool.xml",
+        "ref/dotnet/it/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ja/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ko/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ru/System.Threading.ThreadPool.xml",
+        "ref/dotnet/zh-hans/System.Threading.ThreadPool.xml",
+        "ref/dotnet/zh-hant/System.Threading.ThreadPool.xml",
+        "ref/net46/System.Threading.ThreadPool.dll"
+      ]
+    },
+    "System.Xml.ReaderWriter/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "X9UqQ448oTm1IRpsyW2VXdm7Sl3+4hiKLfTSXHGQIwhqmXDn6w9YJ5QrKvrRtnXZz0Wgebky8/Kz6a59+6nxfg==",
+      "files": [
+        "System.Xml.ReaderWriter.4.0.10-beta-23024.nupkg",
+        "System.Xml.ReaderWriter.4.0.10-beta-23024.nupkg.sha512",
+        "System.Xml.ReaderWriter.nuspec",
+        "lib/dotnet/System.Xml.ReaderWriter.dll",
+        "lib/net46/_._",
+        "ref/dotnet/System.Xml.ReaderWriter.dll",
+        "ref/dotnet/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/de/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/es/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/fr/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/it/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/ja/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/ko/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/ru/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/zh-hans/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/zh-hant/System.Xml.ReaderWriter.xml",
+        "ref/net46/_._"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Collections >= 4.0.10-beta-*",
+      "System.Collections.NonGeneric >= 4.0.0-beta-*",
+      "System.Console >= 4.0.0-beta-*",
+      "System.Diagnostics.Debug >= 4.0.10-beta-*",
+      "System.Diagnostics.Process >= 4.0.0-beta-*",
+      "System.Globalization >= 4.0.10-beta-*",
+      "System.IO >= 4.0.10-beta-*",
+      "System.IO.FileSystem >= 4.0.0-beta-*",
+      "System.IO.FileSystem.Primitives >= 4.0.0-beta-*",
+      "System.Linq >= 4.0.0-beta-*",
+      "System.Reflection >= 4.0.10-beta-*",
+      "System.Reflection.Primitives >= 4.0.0-beta-*",
+      "System.Reflection.TypeExtensions >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Runtime.Handles >= 4.0.0-beta-*",
+      "System.Runtime.InteropServices >= 4.0.20-beta-*",
+      "System.Runtime.Loader >= 4.0.0-beta-*",
+      "System.Text.Encoding >= 4.0.10-beta-*",
+      "System.Text.Encoding.Extensions >= 4.0.10-beta-*",
+      "System.Threading >= 4.0.0-beta-*",
+      "System.Threading.Tasks >= 4.0.10-beta-*",
+      "System.Threading.Thread >= 4.0.0-beta-*",
+      "System.Xml.ReaderWriter >= 4.0.10-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/GC/Stress/Tests/GC_Stress_tests_collection.csproj b/tests/src/GC/Stress/Tests/GC_Stress_tests_collection.csproj
index 4863701..f51cf45 100644 (file)
--- a/tests/src/GC/Stress/Tests/GC_Stress_tests_collection.csproj
+++ b/tests/src/GC/Stress/Tests/GC_Stress_tests_collection.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
@@ -10,6 +10,9 @@
   <PropertyGroup>
     <ProjectGuid>{700E904F-A5F0-4B05-835B-EB256F4202B0}</ProjectGuid>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
   <Target Name="Build">
     <ItemGroup>
       <AllSourceFiles Include="$(MSBuildProjectDirectory)\*.cs" />
@@ -17,6 +20,6 @@
     <PropertyGroup>
       <GenerateRunScript>false</GenerateRunScript>
     </PropertyGroup>
-    <MSBuild Projects="cs_template.proj" Properties="AssemblyName1=%(AllSourceFiles.FileName);IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" />
+    <MSBuild Projects="cs_template.csproj" Properties="AssemblyName1=%(AllSourceFiles.FileName);IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/GC/Stress/Tests/cs_template.proj b/tests/src/GC/Stress/Tests/cs_template.csproj
similarity index 88%
rename from tests/src/GC/Stress/Tests/cs_template.proj
rename to tests/src/GC/Stress/Tests/cs_template.csproj
index a6ef94c..d1b719f 100644 (file)
--- a/tests/src/GC/Stress/Tests/cs_template.proj
+++ b/tests/src/GC/Stress/Tests/cs_template.csproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <GenerateRunScript>false</GenerateRunScript>
@@ -32,13 +32,13 @@
     <Compile Include="$(AssemblyName1).cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

diff --git a/tests/src/GC/Stress/Tests/packages.config b/tests/src/GC/Stress/Tests/packages.config
deleted file mode 100644 (file)
index 6dcf4b9..0000000
--- a/tests/src/GC/Stress/Tests/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-    <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-  <package id="System.Collections" version="4.0.10-beta-22412" />
-  <package id="System.Collections.NonGeneric" version="4.0.0-beta-22512" targetFramework="portable-net45+win" />
-  <package id="System.Threading" version="4.0.0-beta-22412" />
-  <package id="System.Threading.Thread" version="4.0.0-beta-22512" />
-  <package id="System.Runtime.InteropServices" version="4.0.20-beta-22412" />
-  <package id="System.IO" version="4.0.10-beta-22412" targetFramework="portable-net45+win" />
-<package id="System.Globalization" version="4.0.10-beta-22412" targetFramework="portable-net45+win" />
-</packages>

diff --git a/tests/src/GC/Stress/Tests/project.json b/tests/src/GC/Stress/Tests/project.json
new file mode 100644 (file)
index 0000000..4a2a022
--- /dev/null
+++ b/tests/src/GC/Stress/Tests/project.json
@@ -0,0 +1,17 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Collections": "4.0.10-beta-*",
+    "System.Collections.NonGeneric": "4.0.0-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+    "System.Threading.Thread": "4.0.0-beta-*",
+    "System.Runtime.InteropServices": "4.0.20-beta-*",
+    "System.IO": "4.0.10-beta-*",
+    "System.Globalization": "4.0.10-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/GC/Stress/Tests/project.lock.json b/tests/src/GC/Stress/Tests/project.lock.json
new file mode 100644 (file)
index 0000000..44191cb
--- /dev/null
+++ b/tests/src/GC/Stress/Tests/project.lock.json
@@ -0,0 +1,762 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Collections/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Collections.dll": {}
+        }
+      },
+      "System.Collections.NonGeneric/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.NonGeneric.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Collections.NonGeneric.dll": {}
+        }
+      },
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Diagnostics.Debug/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Debug.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Debug.dll": {}
+        }
+      },
+      "System.Globalization/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Thread/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Thread.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Thread.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Collections/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "2ISUf3MQt7JbeT6kXg36qY3fnkjykPXccHcBP0qyTc5vEjbLihC7KCxkHPFJWteKR8lvvSF3+8ES5J34VqezmQ==",
+      "files": [
+        "System.Collections.4.0.10-beta-23024.nupkg",
+        "System.Collections.4.0.10-beta-23024.nupkg.sha512",
+        "System.Collections.nuspec",
+        "lib/DNXCore50/System.Collections.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Collections.dll",
+        "ref/dotnet/System.Collections.dll",
+        "ref/dotnet/System.Collections.xml",
+        "ref/dotnet/de/System.Collections.xml",
+        "ref/dotnet/es/System.Collections.xml",
+        "ref/dotnet/fr/System.Collections.xml",
+        "ref/dotnet/it/System.Collections.xml",
+        "ref/dotnet/ja/System.Collections.xml",
+        "ref/dotnet/ko/System.Collections.xml",
+        "ref/dotnet/ru/System.Collections.xml",
+        "ref/dotnet/zh-hans/System.Collections.xml",
+        "ref/dotnet/zh-hant/System.Collections.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Collections.dll"
+      ]
+    },
+    "System.Collections.NonGeneric/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "Jd4spE+ne509ci1FnwnyOhCP86njatVRlxTBRfzP3gyRjMUkcY7su5Qgtu6yc9b0equR7CjRU8P++sYS6szZ9A==",
+      "files": [
+        "System.Collections.NonGeneric.4.0.0-beta-23024.nupkg",
+        "System.Collections.NonGeneric.4.0.0-beta-23024.nupkg.sha512",
+        "System.Collections.NonGeneric.nuspec",
+        "lib/dotnet/System.Collections.NonGeneric.dll",
+        "lib/net46/System.Collections.NonGeneric.dll",
+        "ref/dotnet/System.Collections.NonGeneric.dll",
+        "ref/dotnet/System.Collections.NonGeneric.xml",
+        "ref/dotnet/de/System.Collections.NonGeneric.xml",
+        "ref/dotnet/es/System.Collections.NonGeneric.xml",
+        "ref/dotnet/fr/System.Collections.NonGeneric.xml",
+        "ref/dotnet/it/System.Collections.NonGeneric.xml",
+        "ref/dotnet/ja/System.Collections.NonGeneric.xml",
+        "ref/dotnet/ko/System.Collections.NonGeneric.xml",
+        "ref/dotnet/ru/System.Collections.NonGeneric.xml",
+        "ref/dotnet/zh-hans/System.Collections.NonGeneric.xml",
+        "ref/dotnet/zh-hant/System.Collections.NonGeneric.xml",
+        "ref/net46/System.Collections.NonGeneric.dll"
+      ]
+    },
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Diagnostics.Debug/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "dnfynhlmsMaRB/YvN5JifCdYYnRf/mTjFAAM1awp3wrjsgOSpAzOE4sxYX0hdY1FyAFTDcUnusQ+H3AMcF3Stw==",
+      "files": [
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg",
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Debug.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Debug.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.xml",
+        "ref/dotnet/de/System.Diagnostics.Debug.xml",
+        "ref/dotnet/es/System.Diagnostics.Debug.xml",
+        "ref/dotnet/fr/System.Diagnostics.Debug.xml",
+        "ref/dotnet/it/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ja/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ko/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ru/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Debug.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Debug.dll"
+      ]
+    },
+    "System.Globalization/4.0.10-beta-23024": {
+      "sha512": "RROZnwQ8phf5Sbb6h8rdnQCoppfKdWKmQ4CiWfvpbRG5XwWbVrMyZsBYazLTQ59MFXe8RXYHgHvE9OfnZPTCLQ==",
+      "files": [
+        "System.Globalization.4.0.10-beta-23024.nupkg",
+        "System.Globalization.4.0.10-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/DNXCore50/System.Globalization.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Globalization.dll"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Thread/4.0.0-beta-23024": {
+      "sha512": "aeok537DgipEVRaoFjfYFf5MAyKm6eXKQQibvvHDertRXx+h1a7sIxt+K9QEHbjxDeKC+06orbGMlasNPSLxHA==",
+      "files": [
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg",
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Thread.nuspec",
+        "lib/DNXCore50/System.Threading.Thread.dll",
+        "lib/net46/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.xml",
+        "ref/dotnet/de/System.Threading.Thread.xml",
+        "ref/dotnet/es/System.Threading.Thread.xml",
+        "ref/dotnet/fr/System.Threading.Thread.xml",
+        "ref/dotnet/it/System.Threading.Thread.xml",
+        "ref/dotnet/ja/System.Threading.Thread.xml",
+        "ref/dotnet/ko/System.Threading.Thread.xml",
+        "ref/dotnet/ru/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hans/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hant/System.Threading.Thread.xml",
+        "ref/net46/System.Threading.Thread.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Collections >= 4.0.10-beta-*",
+      "System.Collections.NonGeneric >= 4.0.0-beta-*",
+      "System.Threading >= 4.0.0-beta-*",
+      "System.Threading.Thread >= 4.0.0-beta-*",
+      "System.Runtime.InteropServices >= 4.0.20-beta-*",
+      "System.IO >= 4.0.10-beta-*",
+      "System.Globalization >= 4.0.10-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Interop/ICastable/Castable.csproj b/tests/src/Interop/ICastable/Castable.csproj
index dac6ca1..8ddad48 100644 (file)
--- a/tests/src/Interop/ICastable/Castable.csproj
+++ b/tests/src/Interop/ICastable/Castable.csproj
@@ -13,10 +13,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
@@ -32,7 +32,7 @@
     <Compile Include="Castable.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/Interop/ICastable/packages.config b/tests/src/Interop/ICastable/packages.config
deleted file mode 100644 (file)
index 569e1be..0000000
--- a/tests/src/Interop/ICastable/packages.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-</packages>

diff --git a/tests/src/Interop/ICastable/project.json b/tests/src/Interop/ICastable/project.json
new file mode 100644 (file)
index 0000000..b04d32f
--- /dev/null
+++ b/tests/src/Interop/ICastable/project.json
@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}

diff --git a/tests/src/Interop/ICastable/project.lock.json b/tests/src/Interop/ICastable/project.lock.json
new file mode 100644 (file)
index 0000000..861d3c3
--- /dev/null
+++ b/tests/src/Interop/ICastable/project.lock.json
@@ -0,0 +1,12 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": [],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.csproj b/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.csproj
index 48ce35c..a1062fb 100644 (file)
--- a/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.csproj
+++ b/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
@@ -32,7 +32,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

diff --git a/tests/src/Interop/ReversePInvoke/Marshalling/packages.config b/tests/src/Interop/ReversePInvoke/Marshalling/packages.config
deleted file mode 100644 (file)
index 9cc4698..0000000
--- a/tests/src/Interop/ReversePInvoke/Marshalling/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.Console" version="4.0.0-beta-22405" />
-  <package id="System.IO" version="4.0.10-beta-22412" targetFramework="portable-net45+win" />
-  <package id="System.Reflection" version="4.0.10-beta-22412" targetFramework="portable-net45+win" />
-  <package id="System.Reflection.Primitives" version="4.0.0-beta-22605" targetFramework="portable-net45+win" />
-  <package id="System.Runtime" version="4.0.20-beta-22412" targetFramework="portable-net45+win" />
-  <package id="System.Runtime.Handles" version="4.0.0-beta-22605" targetFramework="portable-net45+win" />
-  <package id="System.Runtime.InteropServices" version="4.0.20-beta-22605" targetFramework="portable-net45+win" />
-  <package id="System.Text.Encoding" version="4.0.10-beta-22412" targetFramework="portable-net45+win" />
-  <package id="System.Threading.Tasks" version="4.0.10-beta-22412" targetFramework="portable-net45+win" />
-</packages>

diff --git a/tests/src/Interop/ReversePInvoke/Marshalling/project.json b/tests/src/Interop/ReversePInvoke/Marshalling/project.json
new file mode 100644 (file)
index 0000000..867d6a9
--- /dev/null
+++ b/tests/src/Interop/ReversePInvoke/Marshalling/project.json
@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.IO": "4.0.10-beta-*",
+    "System.Reflection": "4.0.10-beta-*",
+    "System.Reflection.Primitives": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Handles": "4.0.0-beta-*",
+    "System.Runtime.InteropServices": "4.0.20-beta-*",
+    "System.Text.Encoding": "4.0.10-beta-*",
+    "System.Threading.Tasks": "4.0.10-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Interop/ReversePInvoke/Marshalling/project.lock.json b/tests/src/Interop/ReversePInvoke/Marshalling/project.lock.json
new file mode 100644 (file)
index 0000000..f85eb73
--- /dev/null
+++ b/tests/src/Interop/ReversePInvoke/Marshalling/project.lock.json
@@ -0,0 +1,574 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.10-beta-23024": {
+      "sha512": "Ky5yclJBgNu+NArFSblpe2FZ/IeLeOYLIP8hLBwTiVDRufjWDqPKcPtETfnmyZq61HGyhTJWFd1uEkhDOgxF9g==",
+      "files": [
+        "System.Reflection.4.0.10-beta-23024.nupkg",
+        "System.Reflection.4.0.10-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/DNXCore50/System.Reflection.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.dll"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "uoRg44bzPk9KE9Sg6rLZmGfUmFZBDc7y25692VYna/WW3Smip/aGX0ESXyuNvWA8k8oXdV4Z/M4ZKdB3ahtdDw==",
+      "files": [
+        "System.Threading.4.0.10-beta-23024.nupkg",
+        "System.Threading.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/DNXCore50/System.Threading.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.dll",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.IO >= 4.0.10-beta-*",
+      "System.Reflection >= 4.0.10-beta-*",
+      "System.Reflection.Primitives >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Handles >= 4.0.0-beta-*",
+      "System.Runtime.InteropServices >= 4.0.20-beta-*",
+      "System.Text.Encoding >= 4.0.10-beta-*",
+      "System.Threading.Tasks >= 4.0.10-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/JIT/BBT/Scenario4/Not-Int32.ilproj b/tests/src/JIT/BBT/Scenario4/Not-Int32.ilproj
index e6ea0e9..4ddb8bc 100644 (file)
--- a/tests/src/JIT/BBT/Scenario4/Not-Int32.ilproj
+++ b/tests/src/JIT/BBT/Scenario4/Not-Int32.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="Not-Int32.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/CodeGenBringUpTests/CodeGenBringUpTests.csproj b/tests/src/JIT/CodeGenBringUpTests/CodeGenBringUpTests.csproj
index a0168ea..e0c16cc 100644 (file)
--- a/tests/src/JIT/CodeGenBringUpTests/CodeGenBringUpTests.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/CodeGenBringUpTests.csproj
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <!-- Default configurations to help VS understand the configurations -->
@@ -10,6 +11,9 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
   <Target Name="Build">
     <ItemGroup>
       <AllSourceFiles Include="$(MSBuildProjectDirectory)\*.cs" />
@@ -17,6 +21,6 @@
     <PropertyGroup>
       <GenerateRunScript>false</GenerateRunScript>
     </PropertyGroup>
-    <MSBuild Projects="cs_template.proj" Properties="AssemblyName1=%(AllSourceFiles.FileName);AllowUnsafeBlocks=True;IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" />
+    <MSBuild Projects="cs_template.csproj" Properties="AssemblyName1=%(AllSourceFiles.FileName);AllowUnsafeBlocks=True;IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\;DefaultBuildAllTarget=Build " />
   </Target>
 </Project>

diff --git a/tests/src/JIT/CodeGenBringUpTests/cs_template.proj b/tests/src/JIT/CodeGenBringUpTests/cs_template.csproj
similarity index 80%
rename from tests/src/JIT/CodeGenBringUpTests/cs_template.proj
rename to tests/src/JIT/CodeGenBringUpTests/cs_template.csproj
index 630b7fb..1eb570f 100644 (file)
--- a/tests/src/JIT/CodeGenBringUpTests/cs_template.proj
+++ b/tests/src/JIT/CodeGenBringUpTests/cs_template.csproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -30,16 +29,16 @@
     <Compile Include="$(AssemblyName1).cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="app.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

diff --git a/tests/src/JIT/Directed/Arrays/Complex1.csproj b/tests/src/JIT/Directed/Arrays/Complex1.csproj
index 88c3b8c..b944f6b 100644 (file)
--- a/tests/src/JIT/Directed/Arrays/Complex1.csproj
+++ b/tests/src/JIT/Directed/Arrays/Complex1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="complex1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/Arrays/Complex2.csproj b/tests/src/JIT/Directed/Arrays/Complex2.csproj
index afc63ab..9f722c3 100644 (file)
--- a/tests/src/JIT/Directed/Arrays/Complex2.csproj
+++ b/tests/src/JIT/Directed/Arrays/Complex2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="complex2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/Arrays/Simple1.csproj b/tests/src/JIT/Directed/Arrays/Simple1.csproj
index 0c9b3cc..2dfaaf7 100644 (file)
--- a/tests/src/JIT/Directed/Arrays/Simple1.csproj
+++ b/tests/src/JIT/Directed/Arrays/Simple1.csproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +32,15 @@
     <Compile Include="simple1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/Arrays/Simple2.csproj b/tests/src/JIT/Directed/Arrays/Simple2.csproj
index b0abe2a..0c5bdfe 100644 (file)
--- a/tests/src/JIT/Directed/Arrays/Simple2.csproj
+++ b/tests/src/JIT/Directed/Arrays/Simple2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="simple2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj
index 0bd3fa0..ac5f06a 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Generic_Test_CSharp_Base_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj
index 518bb12..d407de7 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Generic_Test_CSharp_Base_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj
index fba0dfe..8251e03 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Generic_Test_CSharp_Base_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj
index 6df9500..23de77c 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Generic_Test_CSharp_Base_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj
index b97651e..2503143 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Generic_Test_CSharp_Base_6.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj
index 8933ce9..9040aff 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Generic_Test_CSharp_Peer_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj
index 9c1488d..0a88c28 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Generic_Test_CSharp_Peer_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj
index 1623fec..9cd8486 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Generic_Test_CSharp_Peer_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj
index 3b30fa0..395b621 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Generic_Test_CSharp_Peer_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj
index 471bc9f..a946716 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Generic_Test_CSharp_Peer_6.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj
index ffd289c..1675839 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Test_CSharp_Base_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj
index afb30b4..2213268 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Test_CSharp_Base_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj
index 13b041d..3e76274 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Test_CSharp_Base_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj
index 40b590f..2fe3a71 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Test_CSharp_Base_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj
index 43c522d..c5fe93d 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Test_CSharp_Peer_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj
index b266850..3a7d8c3 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Test_CSharp_Peer_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj
index 6abc10c..13a81e4 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Test_CSharp_Peer_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj
index 4418d80..4d9c6a9 100644 (file)
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Test_CSharp_Peer_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/Convert/implicitConv.ilproj b/tests/src/JIT/Directed/Convert/implicitConv.ilproj
index 248b650..65c5107 100644 (file)
--- a/tests/src/JIT/Directed/Convert/implicitConv.ilproj
+++ b/tests/src/JIT/Directed/Convert/implicitConv.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="implicitConv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/Convert/minopts_convu1.ilproj b/tests/src/JIT/Directed/Convert/minopts_convu1.ilproj
index 840c8ff..fc7a24f 100644 (file)
--- a/tests/src/JIT/Directed/Convert/minopts_convu1.ilproj
+++ b/tests/src/JIT/Directed/Convert/minopts_convu1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="minopts_convu1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj b/tests/src/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj
index f7db6cc..2a498d5 100644 (file)
--- a/tests/src/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj
+++ b/tests/src/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="excepobj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/ExcepFilters/fault/fault.ilproj b/tests/src/JIT/Directed/ExcepFilters/fault/fault.ilproj
index 9a1c16f..05c3c59 100644 (file)
--- a/tests/src/JIT/Directed/ExcepFilters/fault/fault.ilproj
+++ b/tests/src/JIT/Directed/ExcepFilters/fault/fault.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fault.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/ExcepFilters/mixed/mixed.ilproj b/tests/src/JIT/Directed/ExcepFilters/mixed/mixed.ilproj
index eeb15a6..88ccdb7 100644 (file)
--- a/tests/src/JIT/Directed/ExcepFilters/mixed/mixed.ilproj
+++ b/tests/src/JIT/Directed/ExcepFilters/mixed/mixed.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="mixed.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj b/tests/src/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj
index 753eef9..7cb9514 100644 (file)
--- a/tests/src/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj
+++ b/tests/src/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="CallOrder.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj b/tests/src/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj
index f528f4a..02b2fc0 100644 (file)
--- a/tests/src/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj
+++ b/tests/src/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="Nesting.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj b/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj
index c1d859e..fb26398 100644 (file)
--- a/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj
+++ b/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="Simple.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
index 60a333d..911bd1f 100644 (file)
--- a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
+++ b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="TailWinApi.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj b/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj
index 5f1f770..0ae15f7 100644 (file)
--- a/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj
+++ b/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="JitTailcall2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj b/tests/src/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj
index 8cc5ce9..40cf737 100644 (file)
--- a/tests/src/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj
+++ b/tests/src/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="JitTailcall1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/IL/leave/leave1.ilproj b/tests/src/JIT/Directed/IL/leave/leave1.ilproj
index 8a53a0c..fd9abf9 100644 (file)
--- a/tests/src/JIT/Directed/IL/leave/leave1.ilproj
+++ b/tests/src/JIT/Directed/IL/leave/leave1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="leave2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/IL/rethrow/Rethrow1.ilproj b/tests/src/JIT/Directed/IL/rethrow/Rethrow1.ilproj
index 32b276d..f0c9556 100644 (file)
--- a/tests/src/JIT/Directed/IL/rethrow/Rethrow1.ilproj
+++ b/tests/src/JIT/Directed/IL/rethrow/Rethrow1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rethrow1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/IL/rethrow/Rethrow2.ilproj b/tests/src/JIT/Directed/IL/rethrow/Rethrow2.ilproj
index 16e708b..3f9c79a 100644 (file)
--- a/tests/src/JIT/Directed/IL/rethrow/Rethrow2.ilproj
+++ b/tests/src/JIT/Directed/IL/rethrow/Rethrow2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rethrow2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj b/tests/src/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj
index 669ef69..50a4e14 100644 (file)
--- a/tests/src/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj
+++ b/tests/src/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="BadRegArgs.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj b/tests/src/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj
index ce513bd..f38bd97 100644 (file)
--- a/tests/src/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj
+++ b/tests/src/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="SideEffects.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj b/tests/src/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj
index 8f77399..56867c2 100644 (file)
--- a/tests/src/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj
+++ b/tests/src/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="funcptrtest.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj
index 86d0f86..671ae47 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="Box_Unbox.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj
index c0781bd..19b969f 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="add.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/add.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/add.ilproj
index c0781bd..19b969f 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/add.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="add.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
index cae5651..e837991 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="arglist64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj
index b6c7c2f..734c3b2 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj
index a3f0bd7..5093f39 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cpblk.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj
index 5f33ed3..b14175f 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="field_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj
index e684cdb..b22b83e 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fielda_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj
index b699ae5..03d40c1 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initblk.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj
index 2a1aefa..f4ea961 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initobj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj
index f41edaf..d60062b 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldind_stind.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj
index ace8687..6354d52 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldloca.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj
index 86d0f86..671ae47 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="Box_Unbox.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/add.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/add.ilproj
index c0781bd..19b969f 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/add.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="add.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
index cae5651..e837991 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="arglist64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj
index b6c7c2f..734c3b2 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj
index a3f0bd7..5093f39 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cpblk.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj
index 5f33ed3..b14175f 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="field_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj
index e684cdb..b22b83e 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fielda_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj
index b699ae5..03d40c1 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initblk.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj
index 2a1aefa..f4ea961 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initobj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj
index f41edaf..d60062b 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldind_stind.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj
index ace8687..6354d52 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldloca.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj
index 86d0f86..671ae47 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="Box_Unbox.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj
index c0781bd..19b969f 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="add.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/add.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/add.ilproj
index c0781bd..19b969f 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/add.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="add.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
index cae5651..e837991 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="arglist64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj
index b6c7c2f..734c3b2 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj
index a3f0bd7..5093f39 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cpblk.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj
index 5f33ed3..b14175f 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="field_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj
index e684cdb..b22b83e 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fielda_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj
index b699ae5..03d40c1 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initblk.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj
index 2a1aefa..f4ea961 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initobj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj
index f41edaf..d60062b 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldind_stind.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj
index ace8687..6354d52 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldloca.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj
index 86d0f86..671ae47 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="Box_Unbox.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj
index c0781bd..19b969f 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="add.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/add.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/add.ilproj
index adf485b..6a6a93c 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/add.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="add.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
index cae5651..e837991 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="arglist64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj
index b6c7c2f..734c3b2 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj
index a3f0bd7..5093f39 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cpblk.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj
index 5f33ed3..b14175f 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="field_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj
index e684cdb..b22b83e 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fielda_tests.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/initblk.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/initblk.ilproj
index b699ae5..03d40c1 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/initblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/initblk.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initblk.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/initobj.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/initobj.ilproj
index 2a1aefa..f4ea961 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/initobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/initobj.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initobj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj
index f41edaf..d60062b 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldind_stind.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj
index ace8687..6354d52 100644 (file)
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldloca.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/RVAInit/oddsize.ilproj b/tests/src/JIT/Directed/RVAInit/oddsize.ilproj
index e9f4c14..d7a2303 100644 (file)
--- a/tests/src/JIT/Directed/RVAInit/oddsize.ilproj
+++ b/tests/src/JIT/Directed/RVAInit/oddsize.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="oddsize.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj b/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj
index c7375df..5ca7632 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="straccess1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj b/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj
index f60be88..f5283d3 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="straccess1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj b/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj
index c7375df..5ca7632 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="straccess1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj b/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj
index f60be88..f5283d3 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="straccess1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj b/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj
index 957cef7..6f5d11a 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="straccess2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj b/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj
index 8fb7169..aa4dddf 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="straccess2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj b/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj
index 957cef7..6f5d11a 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="straccess2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj b/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj
index 8fb7169..aa4dddf 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="straccess2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj b/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj
index 5b999d5..5000bb1 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="straccess3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj b/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj
index 8cc7841..ace9d56 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="straccess3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj b/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj
index 5b999d5..5000bb1 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="straccess3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj b/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj
index 8cc7841..ace9d56 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="straccess3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StrAccess/straccess4.csproj b/tests/src/JIT/Directed/StrAccess/straccess4.csproj
index 32f317c..4603ea9 100644 (file)
--- a/tests/src/JIT/Directed/StrAccess/straccess4.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="straccess4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SP1.csproj b/tests/src/JIT/Directed/StructPromote/SP1.csproj
index 8a45541..339a0b1 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SP1.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SP1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SP1a.csproj b/tests/src/JIT/Directed/StructPromote/SP1a.csproj
index fbbb43e..be41c92 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SP1a.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1a.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SP1a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SP1a2.csproj b/tests/src/JIT/Directed/StructPromote/SP1a2.csproj
index a72139d..0685747 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SP1a2.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1a2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SP1a2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SP1b.csproj b/tests/src/JIT/Directed/StructPromote/SP1b.csproj
index c5cf2ae..c054d44 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SP1b.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1b.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SP1b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SP1c.csproj b/tests/src/JIT/Directed/StructPromote/SP1c.csproj
index eb6ba49..dcfc764 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SP1c.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1c.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SP1c.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SP1d.csproj b/tests/src/JIT/Directed/StructPromote/SP1d.csproj
index c82da57..eaf6da8 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SP1d.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SP1d.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SP2.csproj b/tests/src/JIT/Directed/StructPromote/SP2.csproj
index e63ba3d..3d0f389 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SP2.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SP2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SP2a.csproj b/tests/src/JIT/Directed/StructPromote/SP2a.csproj
index 69a84cc..ccf31ba 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SP2a.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP2a.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SP2a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SP2b.csproj b/tests/src/JIT/Directed/StructPromote/SP2b.csproj
index d289429..bd5db30 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SP2b.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP2b.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SP2b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SP2c.csproj b/tests/src/JIT/Directed/StructPromote/SP2c.csproj
index 6ff0b4c..310963d 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SP2c.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP2c.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SP2c.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SpAddr.csproj b/tests/src/JIT/Directed/StructPromote/SpAddr.csproj
index 4a7cb8b..052581b 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SpAddr.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SpAddr.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SpAddr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj b/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj
index 63ded7e..61e2c8e 100644 (file)
--- a/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SpAddrAT.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
index c3ff4fd..5525d91 100644 (file)
--- a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
+++ b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
@@ -13,10 +13,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
@@ -32,14 +32,15 @@
     <Compile Include="TypedReference.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)empty.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)empty.project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)empty.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>

diff --git a/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj b/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj
index a845665..a0bde8a 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Dev10_846218.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj
index 79b990c..3f1b69d 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="loop1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj
index 2d4714b..b6a836f 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="loop1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj
index 79b990c..3f1b69d 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="loop1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj
index 2d4714b..b6a836f 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="loop1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/UnrollLoop/loop3_il_d.ilproj b/tests/src/JIT/Directed/UnrollLoop/loop3_il_d.ilproj
index a25aa0f..c0aa12c 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/loop3_il_d.ilproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop3_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="loop3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/UnrollLoop/loop3_il_r.ilproj b/tests/src/JIT/Directed/UnrollLoop/loop3_il_r.ilproj
index 07a4db8..c8f0523 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/loop3_il_r.ilproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop3_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="loop3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj
index 127bcc1..8c6e325 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="loop4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj
index 8f576c0..5cd5516 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="loop4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj
index 127bcc1..8c6e325 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="loop4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj
index 8f576c0..5cd5516 100644 (file)
--- a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="loop4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/array-il/_Arrayssimple3.ilproj b/tests/src/JIT/Directed/array-il/_Arrayssimple3.ilproj
index 4f122dd..3a17251 100644 (file)
--- a/tests/src/JIT/Directed/array-il/_Arrayssimple3.ilproj
+++ b/tests/src/JIT/Directed/array-il/_Arrayssimple3.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="simple3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj
index e7c750a..5b30595 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj
index 2b2441b..0ec1491 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj
index e7c750a..5b30595 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj
index 2b2441b..0ec1491 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj
index 4865953..a0b211f 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj
index b04b4ba..6d7129e 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj
index 4865953..a0b211f 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj
index b04b4ba..6d7129e 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj
index e112261..d403db5 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj
index 8a2417a..8ca3ddd 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj
index e112261..d403db5 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj
index 8a2417a..8ca3ddd 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj
index 30e93b6..b23751d 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj
index b24ec03..c168246 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj
index 30e93b6..b23751d 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj
index b24ec03..c168246 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Bool_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj
index f41ba47..f62a932 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj
index 42a0bbc..5b6d0b8 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj
index f41ba47..f62a932 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj
index 42a0bbc..5b6d0b8 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj
index 6e33ee0..995f290 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj
index e6969b5..8229a9c 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj
index 6e33ee0..995f290 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj
index e6969b5..8229a9c 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj
index 38d5b5d..1dca313 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj
index ffb280d..6b587f3 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj
index 38d5b5d..1dca313 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj
index ffb280d..6b587f3 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj
index 4b7e8e8..a1e717f 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj
index 64b2c0f..12db5c0 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj
index 4b7e8e8..a1e717f 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj
index 64b2c0f..12db5c0 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Double_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj
index 2ce3c5b..23b16d7 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj
index 1ac5bbc..d81dd20 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj
index 2ce3c5b..23b16d7 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj
index 1ac5bbc..d81dd20 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj
index 4a0bdb2..a7fa01f 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj
index dd0d9d2..516de82 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj
index 4a0bdb2..a7fa01f 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj
index dd0d9d2..516de82 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj
index 8fde719..dbc99b0 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj
index 16b0e24..3ac1015 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj
index 8fde719..dbc99b0 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj
index 16b0e24..3ac1015 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj
index f5c0f2b..3ca8490 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj
index 37cd456..87876d1 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj
index f5c0f2b..3ca8490 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj
index 37cd456..87876d1 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Float_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj
index 56cee80..5949b8f 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj
index 79bf45f..2937f16 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj
index 56cee80..5949b8f 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj
index 79bf45f..2937f16 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_And_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj
index 22e56cc..e3b28a9 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj
index edb3e08..6dd355c 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj
index 22e56cc..e3b28a9 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj
index edb3e08..6dd355c 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_No_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj
index 7e35537..666af99 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj
index de03b71..38e3d91 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj
index 7e35537..666af99 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj
index de03b71..38e3d91 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_Or_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj
index 6e5d472..676940f 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj
index 0200927..ba83fae 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj
index 6e5d472..676940f 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj
index 0200927..ba83fae 100644 (file)
--- a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Int_Xor_Op.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj
index 91d3048..e5bd443 100644 (file)
--- a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="xaddmuly.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj
index 9d6c07e..0898f2a 100644 (file)
--- a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="xaddmuly.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj
index 91d3048..e5bd443 100644 (file)
--- a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="xaddmuly.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj
index 9d6c07e..0898f2a 100644 (file)
--- a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="xaddmuly.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/importer/badendfinally.ilproj b/tests/src/JIT/Directed/coverage/importer/badendfinally.ilproj
index c773e22..48db470 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/badendfinally.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/badendfinally.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="badendfinally.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/badtailcall.ilproj b/tests/src/JIT/Directed/coverage/importer/badtailcall.ilproj
index c9da4f9..eafb2cd 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/badtailcall.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/badtailcall.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="badtailcall.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj b/tests/src/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj
index b1fc82b..022c2a8 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="byrefsubbyref1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/calli2.ilproj b/tests/src/JIT/Directed/coverage/importer/calli2.ilproj
index 708e28e..459cb38 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/calli2.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/calli2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="calli2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/ceeillegal.ilproj b/tests/src/JIT/Directed/coverage/importer/ceeillegal.ilproj
index c74dd81..95ad241 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/ceeillegal.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/ceeillegal.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ceeillegal.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj b/tests/src/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj
index 2da7358..8992b25 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldelemnullarr2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj
index a46484e..3430cf8 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldfldstatic1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj b/tests/src/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj
index eb26318..b96ebd6 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldfldunboxedvt.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj b/tests/src/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj
index 07b4c78..1a696bb 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldvirtftnsideeffect.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/nullsdarr.ilproj b/tests/src/JIT/Directed/coverage/importer/nullsdarr.ilproj
index 8f0cdd3..065a3d5 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/nullsdarr.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/nullsdarr.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="nullsdarr.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/refanytype1.ilproj b/tests/src/JIT/Directed/coverage/importer/refanytype1.ilproj
index e2db39d..8e0f8ab 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/refanytype1.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/refanytype1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="refanytype1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj
index 22c47a0..880a09d 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="stfldstatic1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj
index db9f384..2e45282 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="stfldstatic1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj
index 646f135..458c394 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="subovfun1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj
index d226890..e362d66 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="subovfun1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/volatilldind.ilproj b/tests/src/JIT/Directed/coverage/importer/volatilldind.ilproj
index bf0d0bb..53a968e 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/volatilldind.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/volatilldind.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="volatilldind.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/importer/volatilstind.ilproj b/tests/src/JIT/Directed/coverage/importer/volatilstind.ilproj
index 4cf7625..9420baf 100644 (file)
--- a/tests/src/JIT/Directed/coverage/importer/volatilstind.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/volatilstind.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="volatilstind.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj
index 3e46666..0d393d9 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="33objref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj
index dbc5526..9365893 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="33objref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj
index 3e46666..0d393d9 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="33objref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj
index dbc5526..9365893 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="33objref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
index ca8b91f..d03730a 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="callipinvoke.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
index 1502ebd..371a4ae 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="callipinvoke.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj
index 2d48af4..15d8a97 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="arrgetlen.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj
index ed0b923..04f9e32 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="arrgetlen.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj b/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj
index dbf7b15..dce8725 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="callipinvoke.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj
index 44afec6..1c478de 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="cse1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj
index 2a8776b..7a85195 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="cse1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj
index 44afec6..1c478de 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="cse1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj
index 2a8776b..7a85195 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="cse1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj
index 7ce5af3..f8cc853 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="cse2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj
index ec16b86..737c1ad 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="cse2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj
index 7ce5af3..f8cc853 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="cse2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj
index ec16b86..737c1ad 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="cse2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj
index 7089abb..b3d05b2 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj
index 9d513dc..a573ead 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj
index 7089abb..b3d05b2 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj
index 9d513dc..a573ead 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj
index c29c18f..2624b74 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclflddiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj
index 4055cab..e973ccd 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclflddiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj
index c29c18f..2624b74 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclflddiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj
index 4055cab..e973ccd 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclflddiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj
index 10c7807..9449ec6 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj
index 6ad6664..43c3816 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj
index 10c7807..9449ec6 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj
index 6ad6664..43c3816 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj
index d630da5..65da770 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj
index ca5569b..b50c01f 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj
index d630da5..65da770 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj
index ca5569b..b50c01f 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj
index ad6cc4c..c383d98 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj
index 45c5c38..ce7b656 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj
index ad6cc4c..c383d98 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj
index 45c5c38..ce7b656 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lclfldsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj
index 67c5002..aef733b 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lcliimpl.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj
index 370a9ba..0412e55 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lcliimpl.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj
index c587c72..ac1d3b1 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldsshrstsfld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj
index c74df6f..10e8c40 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +33,6 @@
     <Compile Include="ldsshrstsfld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj
index 2841d91..a7e1c2f 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldvirtftncalli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj
index ca3810b..5db7447 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldvirtftncalli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj
index b020b74..ec2a037 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ovfldiv2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj
index 11c5f04..95217f4 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ovfldiv2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj
index 7467445..bae4aa6 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ovflrem2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj
index 0adde3b..81851e9 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ovflrem2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj
index 22c47a0..880a09d 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="stfldstatic1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj
index db9f384..2e45282 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="stfldstatic1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj
index d487c8b..797bbbd 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="stfldstatic2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj
index 29f3dae..2a0ddad 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="stfldstatic2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj
index 177149c..61791f5 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="subbyref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj
index d9c405e..ac6c818 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="subbyref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj
index 9519c99..35086df 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="switchdefaultonly1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj
index 5ce6f66..11fce1c 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="switchdefaultonly1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj
index bec8ee9..a1b0f2f 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="switchdefaultonly2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj
index 4842185..ebaed10 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="switchdefaultonly2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj
index 45d9d60..c84a6bc 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="switchdefaultonly3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj
index dcaaae8..3977ea4 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="switchdefaultonly3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj
index 62bca0a..15e8b14 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="trashreg.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj
index 9e5c1b6..787acf8 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="trashreg.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj
index eb6e264..210b058 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="volatilecpobj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj
index 6a20ab9..f37b470 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="volatilecpobj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj
index bf16025..0e419ae 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="zeroinit.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj
index de582f5..dd29ac6 100644 (file)
--- a/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="zeroinit.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj
index 15f4cc3..ce31d67 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="IntrinsicTest_Overflow.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj
index be9b474..ec4bad8 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="cmpxchg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj
index 1f8a261..f494b96 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="cse_cmpxchg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj
index 508ef8c..3b82a19 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="nullchecksuppress.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj
index 2075814..6dadebf 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="regalloc1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj
index bb201e0..83f915a 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="regalloc2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj
index bd80830..de7b163 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow0.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj
index 88b8514..27bda6e 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow0.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj
index bd80830..de7b163 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow0.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj
index 88b8514..27bda6e 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow0.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj
index f8bb64f..ddc7b36 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj
index bcce71c..c396eaf 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj
index 963613a..69b3484 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj
index bcce71c..c396eaf 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj
index 963613a..69b3484 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj
index 7876faa..2e4accc 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj
index 7481516..a001cfa 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj
index 7876faa..2e4accc 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj
index 7481516..a001cfa 100644 (file)
--- a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pow3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/leave/catch1_d.ilproj b/tests/src/JIT/Directed/leave/catch1_d.ilproj
index 319ea9a..d90958b 100644 (file)
--- a/tests/src/JIT/Directed/leave/catch1_d.ilproj
+++ b/tests/src/JIT/Directed/leave/catch1_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catch1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/catch1_r.ilproj b/tests/src/JIT/Directed/leave/catch1_r.ilproj
index 491951b..1cbdff2 100644 (file)
--- a/tests/src/JIT/Directed/leave/catch1_r.ilproj
+++ b/tests/src/JIT/Directed/leave/catch1_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catch1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/catch2_d.ilproj b/tests/src/JIT/Directed/leave/catch2_d.ilproj
index 404a4e5..e86299a 100644 (file)
--- a/tests/src/JIT/Directed/leave/catch2_d.ilproj
+++ b/tests/src/JIT/Directed/leave/catch2_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catch2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/catch2_r.ilproj b/tests/src/JIT/Directed/leave/catch2_r.ilproj
index 910ea10..86f20c3 100644 (file)
--- a/tests/src/JIT/Directed/leave/catch2_r.ilproj
+++ b/tests/src/JIT/Directed/leave/catch2_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catch2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/catch3_d.ilproj b/tests/src/JIT/Directed/leave/catch3_d.ilproj
index c07e203..fa8ce40 100644 (file)
--- a/tests/src/JIT/Directed/leave/catch3_d.ilproj
+++ b/tests/src/JIT/Directed/leave/catch3_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catch3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/catch3_r.ilproj b/tests/src/JIT/Directed/leave/catch3_r.ilproj
index 28156a1..f3dc34c 100644 (file)
--- a/tests/src/JIT/Directed/leave/catch3_r.ilproj
+++ b/tests/src/JIT/Directed/leave/catch3_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catch3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/filter1_d.ilproj b/tests/src/JIT/Directed/leave/filter1_d.ilproj
index 24ac65a..69d6c1c 100644 (file)
--- a/tests/src/JIT/Directed/leave/filter1_d.ilproj
+++ b/tests/src/JIT/Directed/leave/filter1_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="filter1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/filter1_r.ilproj b/tests/src/JIT/Directed/leave/filter1_r.ilproj
index e7d58db..9e79307 100644 (file)
--- a/tests/src/JIT/Directed/leave/filter1_r.ilproj
+++ b/tests/src/JIT/Directed/leave/filter1_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="filter1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/filter2_d.ilproj b/tests/src/JIT/Directed/leave/filter2_d.ilproj
index 6c77311..8f444a4 100644 (file)
--- a/tests/src/JIT/Directed/leave/filter2_d.ilproj
+++ b/tests/src/JIT/Directed/leave/filter2_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="filter2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/filter2_r.ilproj b/tests/src/JIT/Directed/leave/filter2_r.ilproj
index c78b3e9..3e44574 100644 (file)
--- a/tests/src/JIT/Directed/leave/filter2_r.ilproj
+++ b/tests/src/JIT/Directed/leave/filter2_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="filter2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/filter3_d.ilproj b/tests/src/JIT/Directed/leave/filter3_d.ilproj
index 2982814..86fdff5 100644 (file)
--- a/tests/src/JIT/Directed/leave/filter3_d.ilproj
+++ b/tests/src/JIT/Directed/leave/filter3_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="filter3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/filter3_r.ilproj b/tests/src/JIT/Directed/leave/filter3_r.ilproj
index 9ca6a2f..090ced4 100644 (file)
--- a/tests/src/JIT/Directed/leave/filter3_r.ilproj
+++ b/tests/src/JIT/Directed/leave/filter3_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="filter3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/try1_d.ilproj b/tests/src/JIT/Directed/leave/try1_d.ilproj
index 0a181d8..476f14d 100644 (file)
--- a/tests/src/JIT/Directed/leave/try1_d.ilproj
+++ b/tests/src/JIT/Directed/leave/try1_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="try1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/try1_r.ilproj b/tests/src/JIT/Directed/leave/try1_r.ilproj
index 1785555..780d3fa 100644 (file)
--- a/tests/src/JIT/Directed/leave/try1_r.ilproj
+++ b/tests/src/JIT/Directed/leave/try1_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="try1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/try2_d.ilproj b/tests/src/JIT/Directed/leave/try2_d.ilproj
index b07d877..02a5c0e 100644 (file)
--- a/tests/src/JIT/Directed/leave/try2_d.ilproj
+++ b/tests/src/JIT/Directed/leave/try2_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="try2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/try2_r.ilproj b/tests/src/JIT/Directed/leave/try2_r.ilproj
index 82e6c0c..a640531 100644 (file)
--- a/tests/src/JIT/Directed/leave/try2_r.ilproj
+++ b/tests/src/JIT/Directed/leave/try2_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="try2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/try3_d.ilproj b/tests/src/JIT/Directed/leave/try3_d.ilproj
index c25f571..3e819ba 100644 (file)
--- a/tests/src/JIT/Directed/leave/try3_d.ilproj
+++ b/tests/src/JIT/Directed/leave/try3_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="try3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/leave/try3_r.ilproj b/tests/src/JIT/Directed/leave/try3_r.ilproj
index 506808c..54dfcab 100644 (file)
--- a/tests/src/JIT/Directed/leave/try3_r.ilproj
+++ b/tests/src/JIT/Directed/leave/try3_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="try3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/lifetime/lifetime1.csproj b/tests/src/JIT/Directed/lifetime/lifetime1.csproj
index 2bad1e9..5e25cf7 100644 (file)
--- a/tests/src/JIT/Directed/lifetime/lifetime1.csproj
+++ b/tests/src/JIT/Directed/lifetime/lifetime1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lifetime1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/lifetime/lifetime2.csproj b/tests/src/JIT/Directed/lifetime/lifetime2.csproj
index fa7a051..8b5c89c 100644 (file)
--- a/tests/src/JIT/Directed/lifetime/lifetime2.csproj
+++ b/tests/src/JIT/Directed/lifetime/lifetime2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lifetime2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj b/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj
index af4b8d3..b2226a9 100644 (file)
--- a/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj
+++ b/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="localloc3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj b/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj
index fa2e7e5..26b8e1d 100644 (file)
--- a/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj
+++ b/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="localloc3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj b/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj
index af4b8d3..b2226a9 100644 (file)
--- a/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj
+++ b/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="localloc3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj b/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj
index fa2e7e5..26b8e1d 100644 (file)
--- a/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj
+++ b/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="localloc3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/newarr/newarr.csproj b/tests/src/JIT/Directed/newarr/newarr.csproj
index 9c96196..413894d 100644 (file)
--- a/tests/src/JIT/Directed/newarr/newarr.csproj
+++ b/tests/src/JIT/Directed/newarr/newarr.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="newarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/pinvoke/jump.ilproj b/tests/src/JIT/Directed/pinvoke/jump.ilproj
index aff1498..62a0f6a 100644 (file)
--- a/tests/src/JIT/Directed/pinvoke/jump.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/jump.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jump.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj b/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj
index 7a56159..3aa1fb5 100644 (file)
--- a/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="sysinfo.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/refbyref/byrefconvert_il_d.ilproj b/tests/src/JIT/Directed/refbyref/byrefconvert_il_d.ilproj
index 7b3e4a5..ffcd988 100644 (file)
--- a/tests/src/JIT/Directed/refbyref/byrefconvert_il_d.ilproj
+++ b/tests/src/JIT/Directed/refbyref/byrefconvert_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="byrefconvert.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/refbyref/byrefconvert_il_r.ilproj b/tests/src/JIT/Directed/refbyref/byrefconvert_il_r.ilproj
index 497086d..be152f5 100644 (file)
--- a/tests/src/JIT/Directed/refbyref/byrefconvert_il_r.ilproj
+++ b/tests/src/JIT/Directed/refbyref/byrefconvert_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="byrefconvert.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/shift/int16_cs_d.csproj b/tests/src/JIT/Directed/shift/int16_cs_d.csproj
index a748845..f43d2dd 100644 (file)
--- a/tests/src/JIT/Directed/shift/int16_cs_d.csproj
+++ b/tests/src/JIT/Directed/shift/int16_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int16_cs_do.csproj b/tests/src/JIT/Directed/shift/int16_cs_do.csproj
index f258a28..b85af73 100644 (file)
--- a/tests/src/JIT/Directed/shift/int16_cs_do.csproj
+++ b/tests/src/JIT/Directed/shift/int16_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int16_cs_r.csproj b/tests/src/JIT/Directed/shift/int16_cs_r.csproj
index a748845..f43d2dd 100644 (file)
--- a/tests/src/JIT/Directed/shift/int16_cs_r.csproj
+++ b/tests/src/JIT/Directed/shift/int16_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int16_cs_ro.csproj b/tests/src/JIT/Directed/shift/int16_cs_ro.csproj
index f258a28..b85af73 100644 (file)
--- a/tests/src/JIT/Directed/shift/int16_cs_ro.csproj
+++ b/tests/src/JIT/Directed/shift/int16_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int16_d.csproj b/tests/src/JIT/Directed/shift/int16_d.csproj
index a748845..f43d2dd 100644 (file)
--- a/tests/src/JIT/Directed/shift/int16_d.csproj
+++ b/tests/src/JIT/Directed/shift/int16_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int16_do.csproj b/tests/src/JIT/Directed/shift/int16_do.csproj
index f258a28..b85af73 100644 (file)
--- a/tests/src/JIT/Directed/shift/int16_do.csproj
+++ b/tests/src/JIT/Directed/shift/int16_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int16_r.csproj b/tests/src/JIT/Directed/shift/int16_r.csproj
index a748845..f43d2dd 100644 (file)
--- a/tests/src/JIT/Directed/shift/int16_r.csproj
+++ b/tests/src/JIT/Directed/shift/int16_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int16_ro.csproj b/tests/src/JIT/Directed/shift/int16_ro.csproj
index f258a28..b85af73 100644 (file)
--- a/tests/src/JIT/Directed/shift/int16_ro.csproj
+++ b/tests/src/JIT/Directed/shift/int16_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int32_cs_d.csproj b/tests/src/JIT/Directed/shift/int32_cs_d.csproj
index a07f050..ce20dc4 100644 (file)
--- a/tests/src/JIT/Directed/shift/int32_cs_d.csproj
+++ b/tests/src/JIT/Directed/shift/int32_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int32_cs_do.csproj b/tests/src/JIT/Directed/shift/int32_cs_do.csproj
index 76588c2..7ffbc08 100644 (file)
--- a/tests/src/JIT/Directed/shift/int32_cs_do.csproj
+++ b/tests/src/JIT/Directed/shift/int32_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int32_cs_r.csproj b/tests/src/JIT/Directed/shift/int32_cs_r.csproj
index a07f050..ce20dc4 100644 (file)
--- a/tests/src/JIT/Directed/shift/int32_cs_r.csproj
+++ b/tests/src/JIT/Directed/shift/int32_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int32_cs_ro.csproj b/tests/src/JIT/Directed/shift/int32_cs_ro.csproj
index 76588c2..7ffbc08 100644 (file)
--- a/tests/src/JIT/Directed/shift/int32_cs_ro.csproj
+++ b/tests/src/JIT/Directed/shift/int32_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int32_d.csproj b/tests/src/JIT/Directed/shift/int32_d.csproj
index a07f050..ce20dc4 100644 (file)
--- a/tests/src/JIT/Directed/shift/int32_d.csproj
+++ b/tests/src/JIT/Directed/shift/int32_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int32_do.csproj b/tests/src/JIT/Directed/shift/int32_do.csproj
index 76588c2..7ffbc08 100644 (file)
--- a/tests/src/JIT/Directed/shift/int32_do.csproj
+++ b/tests/src/JIT/Directed/shift/int32_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int32_r.csproj b/tests/src/JIT/Directed/shift/int32_r.csproj
index a07f050..ce20dc4 100644 (file)
--- a/tests/src/JIT/Directed/shift/int32_r.csproj
+++ b/tests/src/JIT/Directed/shift/int32_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int32_ro.csproj b/tests/src/JIT/Directed/shift/int32_ro.csproj
index 76588c2..7ffbc08 100644 (file)
--- a/tests/src/JIT/Directed/shift/int32_ro.csproj
+++ b/tests/src/JIT/Directed/shift/int32_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int64_d.csproj b/tests/src/JIT/Directed/shift/int64_d.csproj
index 9e7f30b..14cd19f 100644 (file)
--- a/tests/src/JIT/Directed/shift/int64_d.csproj
+++ b/tests/src/JIT/Directed/shift/int64_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int64_do.csproj b/tests/src/JIT/Directed/shift/int64_do.csproj
index 81bd6db..a5d1a6a 100644 (file)
--- a/tests/src/JIT/Directed/shift/int64_do.csproj
+++ b/tests/src/JIT/Directed/shift/int64_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int64_r.csproj b/tests/src/JIT/Directed/shift/int64_r.csproj
index 9e7f30b..14cd19f 100644 (file)
--- a/tests/src/JIT/Directed/shift/int64_r.csproj
+++ b/tests/src/JIT/Directed/shift/int64_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int64_ro.csproj b/tests/src/JIT/Directed/shift/int64_ro.csproj
index 81bd6db..a5d1a6a 100644 (file)
--- a/tests/src/JIT/Directed/shift/int64_ro.csproj
+++ b/tests/src/JIT/Directed/shift/int64_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/int8_il_d.ilproj b/tests/src/JIT/Directed/shift/int8_il_d.ilproj
index 6d89e8b..5cedf89 100644 (file)
--- a/tests/src/JIT/Directed/shift/int8_il_d.ilproj
+++ b/tests/src/JIT/Directed/shift/int8_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="int8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/shift/int8_il_r.ilproj b/tests/src/JIT/Directed/shift/int8_il_r.ilproj
index 72c3684..4f415e1 100644 (file)
--- a/tests/src/JIT/Directed/shift/int8_il_r.ilproj
+++ b/tests/src/JIT/Directed/shift/int8_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="int8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/shift/nativeint_il_d.ilproj b/tests/src/JIT/Directed/shift/nativeint_il_d.ilproj
index cfa21ec..6c368c2 100644 (file)
--- a/tests/src/JIT/Directed/shift/nativeint_il_d.ilproj
+++ b/tests/src/JIT/Directed/shift/nativeint_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="nativeint.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/shift/nativeint_il_r.ilproj b/tests/src/JIT/Directed/shift/nativeint_il_r.ilproj
index fc414d0..ea36a75 100644 (file)
--- a/tests/src/JIT/Directed/shift/nativeint_il_r.ilproj
+++ b/tests/src/JIT/Directed/shift/nativeint_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="nativeint.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/shift/nativeuint_il_d.ilproj b/tests/src/JIT/Directed/shift/nativeuint_il_d.ilproj
index 5559012..317090f 100644 (file)
--- a/tests/src/JIT/Directed/shift/nativeuint_il_d.ilproj
+++ b/tests/src/JIT/Directed/shift/nativeuint_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="nativeuint.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/shift/nativeuint_il_r.ilproj b/tests/src/JIT/Directed/shift/nativeuint_il_r.ilproj
index b8fd51c..c51bb22 100644 (file)
--- a/tests/src/JIT/Directed/shift/nativeuint_il_r.ilproj
+++ b/tests/src/JIT/Directed/shift/nativeuint_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="nativeuint.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/shift/uint16_cs_d.csproj b/tests/src/JIT/Directed/shift/uint16_cs_d.csproj
index 4ccaefc..25097db 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint16_cs_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint16_cs_do.csproj b/tests/src/JIT/Directed/shift/uint16_cs_do.csproj
index b5fd10e..8979bc2 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint16_cs_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint16_cs_r.csproj b/tests/src/JIT/Directed/shift/uint16_cs_r.csproj
index 4ccaefc..25097db 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint16_cs_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj b/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj
index b5fd10e..8979bc2 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint16_d.csproj b/tests/src/JIT/Directed/shift/uint16_d.csproj
index 4ccaefc..25097db 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint16_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint16_do.csproj b/tests/src/JIT/Directed/shift/uint16_do.csproj
index b5fd10e..8979bc2 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint16_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint16_r.csproj b/tests/src/JIT/Directed/shift/uint16_r.csproj
index 4ccaefc..25097db 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint16_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint16_ro.csproj b/tests/src/JIT/Directed/shift/uint16_ro.csproj
index b5fd10e..8979bc2 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint16_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint32_cs_d.csproj b/tests/src/JIT/Directed/shift/uint32_cs_d.csproj
index 8960758..fa3096c 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint32_cs_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint32_cs_do.csproj b/tests/src/JIT/Directed/shift/uint32_cs_do.csproj
index 62ba86f..1857f64 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint32_cs_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint32_cs_r.csproj b/tests/src/JIT/Directed/shift/uint32_cs_r.csproj
index 8960758..fa3096c 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint32_cs_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj b/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj
index 62ba86f..1857f64 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint32_d.csproj b/tests/src/JIT/Directed/shift/uint32_d.csproj
index 8960758..fa3096c 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint32_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint32_do.csproj b/tests/src/JIT/Directed/shift/uint32_do.csproj
index 62ba86f..1857f64 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint32_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint32_r.csproj b/tests/src/JIT/Directed/shift/uint32_r.csproj
index 8960758..fa3096c 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint32_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint32_ro.csproj b/tests/src/JIT/Directed/shift/uint32_ro.csproj
index 62ba86f..1857f64 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint32_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint64_d.csproj b/tests/src/JIT/Directed/shift/uint64_d.csproj
index 0ef3479..df4a479 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint64_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint64_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint64_do.csproj b/tests/src/JIT/Directed/shift/uint64_do.csproj
index df4b6dd..5c63bfa 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint64_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint64_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint64_r.csproj b/tests/src/JIT/Directed/shift/uint64_r.csproj
index 0ef3479..df4a479 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint64_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint64_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint64_ro.csproj b/tests/src/JIT/Directed/shift/uint64_ro.csproj
index df4b6dd..5c63bfa 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint64_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint64_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint8_cs_d.csproj b/tests/src/JIT/Directed/shift/uint8_cs_d.csproj
index 7c9a937..108f8c1 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint8_cs_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint8_cs_do.csproj b/tests/src/JIT/Directed/shift/uint8_cs_do.csproj
index b236fcb..a2c27af 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint8_cs_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint8_cs_r.csproj b/tests/src/JIT/Directed/shift/uint8_cs_r.csproj
index 7c9a937..108f8c1 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint8_cs_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj b/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj
index b236fcb..a2c27af 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint8_d.csproj b/tests/src/JIT/Directed/shift/uint8_d.csproj
index 7c9a937..108f8c1 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint8_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint8_do.csproj b/tests/src/JIT/Directed/shift/uint8_do.csproj
index b236fcb..a2c27af 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint8_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint8_r.csproj b/tests/src/JIT/Directed/shift/uint8_r.csproj
index 7c9a937..108f8c1 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint8_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/shift/uint8_ro.csproj b/tests/src/JIT/Directed/shift/uint8_ro.csproj
index b236fcb..a2c27af 100644 (file)
--- a/tests/src/JIT/Directed/shift/uint8_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Directed/throwbox/fault.ilproj b/tests/src/JIT/Directed/throwbox/fault.ilproj
index 9a1c16f..05c3c59 100644 (file)
--- a/tests/src/JIT/Directed/throwbox/fault.ilproj
+++ b/tests/src/JIT/Directed/throwbox/fault.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fault.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/throwbox/filter.ilproj b/tests/src/JIT/Directed/throwbox/filter.ilproj
index d2285a4..5ee66d8 100644 (file)
--- a/tests/src/JIT/Directed/throwbox/filter.ilproj
+++ b/tests/src/JIT/Directed/throwbox/filter.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="filter.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/throwbox/finally.ilproj b/tests/src/JIT/Directed/throwbox/finally.ilproj
index fa18707..93356bf 100644 (file)
--- a/tests/src/JIT/Directed/throwbox/finally.ilproj
+++ b/tests/src/JIT/Directed/throwbox/finally.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="finally.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/throwbox/rethrow.ilproj b/tests/src/JIT/Directed/throwbox/rethrow.ilproj
index a9fd216..3c221f9 100644 (file)
--- a/tests/src/JIT/Directed/throwbox/rethrow.ilproj
+++ b/tests/src/JIT/Directed/throwbox/rethrow.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rethrow.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/zeroinit/Dev10_863995.ilproj b/tests/src/JIT/Directed/zeroinit/Dev10_863995.ilproj
index b14188c..358b825 100644 (file)
--- a/tests/src/JIT/Directed/zeroinit/Dev10_863995.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/Dev10_863995.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="Dev10_863995.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/zeroinit/init_byte.ilproj b/tests/src/JIT/Directed/zeroinit/init_byte.ilproj
index 10ae4a4..1361030 100644 (file)
--- a/tests/src/JIT/Directed/zeroinit/init_byte.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_byte.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="init_byte.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/zeroinit/init_int32.ilproj b/tests/src/JIT/Directed/zeroinit/init_int32.ilproj
index f74d9a7..62a5907 100644 (file)
--- a/tests/src/JIT/Directed/zeroinit/init_int32.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_int32.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="init_int32.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/zeroinit/init_int64.ilproj b/tests/src/JIT/Directed/zeroinit/init_int64.ilproj
index 2127920..488124b 100644 (file)
--- a/tests/src/JIT/Directed/zeroinit/init_int64.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_int64.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="init_int64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/zeroinit/init_struct.ilproj b/tests/src/JIT/Directed/zeroinit/init_struct.ilproj
index e44cae8..dbade10 100644 (file)
--- a/tests/src/JIT/Directed/zeroinit/init_struct.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_struct.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="init_struct.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/zeroinit/init_uint32.ilproj b/tests/src/JIT/Directed/zeroinit/init_uint32.ilproj
index d45de87..4fdbcb9 100644 (file)
--- a/tests/src/JIT/Directed/zeroinit/init_uint32.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_uint32.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="init_uint32.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/zeroinit/init_uint64.ilproj b/tests/src/JIT/Directed/zeroinit/init_uint64.ilproj
index 101080f..68e6869 100644 (file)
--- a/tests/src/JIT/Directed/zeroinit/init_uint64.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_uint64.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="init_uint64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Directed/zeroinit/tail.ilproj b/tests/src/JIT/Directed/zeroinit/tail.ilproj
index ea950f8..eefc0b1 100644 (file)
--- a/tests/src/JIT/Directed/zeroinit/tail.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/tail.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="tail.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj
index a7242a3..dac90ae 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj
index 4e849ca..eed1247 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Struct01_instance.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj
index 79c0a14..c2c05af 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj
index 3953829..67ade52 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class01_instance.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj
index 73ffc11..96e4b8d 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class01_static.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj
index 3971011..afac67d 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj
index 3ce8856..b5bbd8f 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj
index 35edfc3..d62ee65 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class04.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj
index ea150b9..390a1eb 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class05.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj
index 7c456a0..6627bdc 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class06.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj
index 0b3fe00..3d492bf 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class07.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj
index 0a8b69a..f656629 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struc01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj
index a5c5b17..7d49322 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct01_static.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj
index 876e329..714126b 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj
index 0c44cde..2be929b 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj
index 1f15339..c1c2219 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct04.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj
index d96511e..90dfa98 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct05.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj
index dbbc672..63cde1f 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct06.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj
index bb3a7cf..a1418b0 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct07.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj
index 051817a..4510a7f 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj
index 111c0f3..74d95f2 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class01_Instance.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj
index cfa5a0a..cf4c107 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class01_static.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj
index afc2bec..0844a73 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj
index e7833b1..3453a9e 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct01_Instance.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj
index d8d2d31..c0efd2f 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct01_static.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj b/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj
index 051817a..4510a7f 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj
+++ b/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj b/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj
index afc2bec..0844a73 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj
+++ b/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj b/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj
index 051817a..4510a7f 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj
+++ b/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj b/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj
index afc2bec..0844a73 100644 (file)
--- a/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj
+++ b/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj
index f14bb97..6f1ad3c 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj
index ba27061..1d5f7ac 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj
index f14bb97..6f1ad3c 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj
index ba27061..1d5f7ac 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj
index 44c0557..9ce6515 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj
index 19ed392..1a67a89 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj
index 44c0557..9ce6515 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj
index 19ed392..1a67a89 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="class2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj
index f267eb5..0232f7e 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj
index 27cc16e..d183143 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj
index f267eb5..0232f7e 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj
index 27cc16e..d183143 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj
index 594ab84..49bae0a 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vt1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj
index 33f55e4..27350a9 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vt1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj
index 1ede1a7..8729c33 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj
index 6beddd8..13e6cdb 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj
index 1ede1a7..8729c33 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj
index 6beddd8..13e6cdb 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj
index 1de8c39..f145f3c 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vt2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj
index 4cf8f40..fbe94a2 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vt2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj
index 88297a9..7c4721e 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj
index 6b93da5..e2de353 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj
index 88297a9..7c4721e 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj
index 6b93da5..e2de353 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj
index 8ae6672..6bddde2 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vt3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj
index 8660219..173e19d 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vt3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj
index fe8bc71..2e9741c 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj
index a004c6d..baab869 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj
index fe8bc71..2e9741c 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj
index a004c6d..baab869 100644 (file)
--- a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vt4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj b/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj
index 4fd4c23..7ccce40 100644 (file)
--- a/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj
+++ b/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Call_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj b/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj
index 24a6e35..e5226cd 100644 (file)
--- a/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj
+++ b/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Call_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj b/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj
index 4fd4c23..7ccce40 100644 (file)
--- a/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj
+++ b/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Call_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj b/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj
index 24a6e35..e5226cd 100644 (file)
--- a/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj
+++ b/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Call_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Constraints/call_instance01.csproj b/tests/src/JIT/Generics/Constraints/call_instance01.csproj
index 1bd5d03..36da6e1 100644 (file)
--- a/tests/src/JIT/Generics/Constraints/call_instance01.csproj
+++ b/tests/src/JIT/Generics/Constraints/call_instance01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Call_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Constraints/call_static01.csproj b/tests/src/JIT/Generics/Constraints/call_static01.csproj
index 84cc9e9..e2a7337 100644 (file)
--- a/tests/src/JIT/Generics/Constraints/call_static01.csproj
+++ b/tests/src/JIT/Generics/Constraints/call_static01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Call_static01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Constraints/convert_instance01.csproj b/tests/src/JIT/Generics/Constraints/convert_instance01.csproj
index fd905b9..8615a86 100644 (file)
--- a/tests/src/JIT/Generics/Constraints/convert_instance01.csproj
+++ b/tests/src/JIT/Generics/Constraints/convert_instance01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Convert_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Constraints/convert_static01.csproj b/tests/src/JIT/Generics/Constraints/convert_static01.csproj
index c83a76a..0f6dfed 100644 (file)
--- a/tests/src/JIT/Generics/Constraints/convert_static01.csproj
+++ b/tests/src/JIT/Generics/Constraints/convert_static01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Convert_static01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj b/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj
index 51d5026..da2dc07 100644 (file)
--- a/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj
+++ b/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Transitive_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Constraints/transitive_static01.csproj b/tests/src/JIT/Generics/Constraints/transitive_static01.csproj
index 4f8e5da..bfa391e 100644 (file)
--- a/tests/src/JIT/Generics/Constraints/transitive_static01.csproj
+++ b/tests/src/JIT/Generics/Constraints/transitive_static01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Transitive_static01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj b/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj
index b5ee325..a46b070 100644 (file)
--- a/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj
+++ b/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="box_unbox01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj
index ca54007..1b87b99 100644 (file)
--- a/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="GenToGen01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj
index ddca415..a21e495 100644 (file)
--- a/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="GenToGen02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj
index 3e339e7..9a92d8d 100644 (file)
--- a/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="GenToGen03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj
index 51ece5c..ef06f14 100644 (file)
--- a/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="GenToNonGen01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj
index 675cc87..bc449c2 100644 (file)
--- a/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="GenToNonGen02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj
index e19d2d7..0b6edf9 100644 (file)
--- a/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="GenToNonGen03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj b/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj
index bb99db5..fed8f42 100644 (file)
--- a/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="NonGenToGen01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj b/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj
index c15e43b..3dc69b5 100644 (file)
--- a/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="NonGenToGen02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj b/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj
index 756e389..0a114a1 100644 (file)
--- a/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="NonGenToGen03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj b/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj
index 873d9de..2b2f954 100644 (file)
--- a/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="chaos55915408cs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj b/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj
index 63d0b36..15a436a 100644 (file)
--- a/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="chaos55915408cs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj b/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj
index eea6cec..d3889fb 100644 (file)
--- a/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="chaos56200037cs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj b/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj
index b1a3790..d4d6ef1 100644 (file)
--- a/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="chaos56200037cs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj b/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
index 7f0c695..85d70de 100644 (file)
--- a/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="chaos65204782cs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj b/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
index 874d45d..a5785fe 100644 (file)
--- a/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="chaos65204782cs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj b/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj
index 556d465..c90ab4b 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="general_class_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj b/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj
index 78b9ede..9002442 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="general_class_static01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj b/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj
index 5dccce7..0d296c3 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="general_struct_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj b/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj
index 0012a34..2b9639a 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="general_struct_static01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj b/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj
index 45bb463..187badd 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="specific_class_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj b/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj
index f38c738..7f711a2 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="specific_class_instance02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj b/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj
index adc5934..dfd3dde 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="specific_class_static01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj b/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj
index c825314..51098f3 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="specific_class_static02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj b/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj
index e8bfb4a..ca9547e 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="specific_struct_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj b/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj
index ff917cd..86e2da8 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="specific_struct_instance02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj b/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj
index 45336a3..3c138b6 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="specific_struct_static01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj b/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj
index 6195132..0a2a471 100644 (file)
--- a/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="specific_struct_static02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj b/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj
index 50de883..f5de738 100644 (file)
--- a/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_assignment_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj b/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj
index b811f2c..8f12acb 100644 (file)
--- a/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_assignment_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj b/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj
index 09d83f3..b3b1680 100644 (file)
--- a/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_equalnull_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj b/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj
index fa51261..2bef2aa 100644 (file)
--- a/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_equalnull_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj b/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj
index f43cb09..dab91bb 100644 (file)
--- a/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_passing_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj b/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj
index 0247842..21f19e8 100644 (file)
--- a/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_passing_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj b/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj
index 8a1651d..d16270e 100644 (file)
--- a/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_assignment_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj b/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj
index c283272..0f1b097 100644 (file)
--- a/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_assignment_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj b/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj
index 4316956..ab719ed 100644 (file)
--- a/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_equalnull_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj b/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj
index b50977e..e71301a 100644 (file)
--- a/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_equalnull_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/static_passing_class01.csproj b/tests/src/JIT/Generics/Fields/static_passing_class01.csproj
index c1b30f6..b190b25 100644 (file)
--- a/tests/src/JIT/Generics/Fields/static_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_passing_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_passing_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj b/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj
index 2c43c45..247b257 100644 (file)
--- a/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_passing_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj b/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj
index cb0d5b5..5956184 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="BaseClass01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj b/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj
index c3f8e51..5cdcc59 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="BaseClass02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj b/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj
index 5a566e5..2b3af90 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="BaseClass03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj b/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj
index 1f045fd..0e0f5b0 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Baseclass04.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj b/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj
index 9282a21..91bfadc 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Baseclass05.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj b/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj
index 051817a..4510a7f 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj b/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj
index ef68393..861edc2 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj b/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj
index 7d67e69..5421ae5 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj
index 35ca2ef..bb9fc67 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj
index 04c9349..5c6109d 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Class02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj
index 4b5f0ca..a415beb 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Class03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj
index d944e51..5b51b9f 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Class04.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj
index 822934d..0c4fb2a 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Class05.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj
index a4c79e5..c99b75c 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj
index 4c87846..75d4ce8 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Struct02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj
index e85e107..1001250 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Struct03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj
index 0a2a2ea..bfdc628 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Struct04.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj
index 3920b24..e718e11 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Struct05.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj b/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj
index afc2bec..0844a73 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj b/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj
index eddcf6a..ecdbfe6 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj b/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj
index e70d764..265c640 100644 (file)
--- a/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj b/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj
index 50de883..f5de738 100644 (file)
--- a/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_assignment_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj b/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj
index b811f2c..8f12acb 100644 (file)
--- a/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_assignment_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj b/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj
index 09d83f3..b3b1680 100644 (file)
--- a/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_equalnull_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj b/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj
index fa51261..2bef2aa 100644 (file)
--- a/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_equalnull_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj b/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj
index f43cb09..dab91bb 100644 (file)
--- a/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_passing_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj b/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj
index 0247842..21f19e8 100644 (file)
--- a/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_passing_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj b/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj
index 8a1651d..d16270e 100644 (file)
--- a/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_assignment_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj b/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj
index c283272..0f1b097 100644 (file)
--- a/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_assignment_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj b/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj
index 4316956..ab719ed 100644 (file)
--- a/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_equalnull_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj b/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj
index b50977e..e71301a 100644 (file)
--- a/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_equalnull_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/static_passing_class01.csproj b/tests/src/JIT/Generics/Locals/static_passing_class01.csproj
index c1b30f6..b190b25 100644 (file)
--- a/tests/src/JIT/Generics/Locals/static_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_passing_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_passing_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj b/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj
index 2c43c45..247b257 100644 (file)
--- a/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_passing_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj b/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj
index 641c104..4b5b0e5 100644 (file)
--- a/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/MemberAccess/class_static01.csproj b/tests/src/JIT/Generics/MemberAccess/class_static01.csproj
index 3c16d90..ee2cf49 100644 (file)
--- a/tests/src/JIT/Generics/MemberAccess/class_static01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/class_static01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class_static01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj b/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj
index 2bb66ff..9873a28 100644 (file)
--- a/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="interface_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj b/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj
index 4b9a104..532eec0 100644 (file)
--- a/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="interface_class02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj b/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj
index 0f445ca..cbf0414 100644 (file)
--- a/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="interface_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj b/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj
index 0f5ff29..64e7fc7 100644 (file)
--- a/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="interface_struct02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj b/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj
index fc78ccf..58e8ae6 100644 (file)
--- a/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct_instance01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj b/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj
index aaaac84..f3757e8 100644 (file)
--- a/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct_static01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj b/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj
index 50de883..f5de738 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_assignment_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj b/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj
index b811f2c..8f12acb 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_assignment_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj b/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj
index 09d83f3..b3b1680 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_equalnull_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj b/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj
index fa51261..2bef2aa 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_equalnull_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj b/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj
index f43cb09..dab91bb 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_passing_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj b/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj
index 0247842..21f19e8 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="instance_passing_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj b/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj
index 8a1651d..d16270e 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_assignment_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj b/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj
index c283272..0f1b097 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_assignment_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj b/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj
index 4316956..ab719ed 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_equalnull_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj b/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj
index b50977e..e71301a 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_equalnull_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj b/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj
index c1b30f6..b190b25 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_passing_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj b/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj
index 2c43c45..247b257 100644 (file)
--- a/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="static_passing_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/TypeParameters/default_class01.csproj b/tests/src/JIT/Generics/TypeParameters/default_class01.csproj
index f5c40c6..80f35db 100644 (file)
--- a/tests/src/JIT/Generics/TypeParameters/default_class01.csproj
+++ b/tests/src/JIT/Generics/TypeParameters/default_class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="default_class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj b/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj
index 0acfb82..02f3385 100644 (file)
--- a/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj
+++ b/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="default_struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Typeof/class01.csproj b/tests/src/JIT/Generics/Typeof/class01.csproj
index 051817a..4510a7f 100644 (file)
--- a/tests/src/JIT/Generics/Typeof/class01.csproj
+++ b/tests/src/JIT/Generics/Typeof/class01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Typeof/class02.csproj b/tests/src/JIT/Generics/Typeof/class02.csproj
index ef68393..861edc2 100644 (file)
--- a/tests/src/JIT/Generics/Typeof/class02.csproj
+++ b/tests/src/JIT/Generics/Typeof/class02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Typeof/class03.csproj b/tests/src/JIT/Generics/Typeof/class03.csproj
index 7d67e69..5421ae5 100644 (file)
--- a/tests/src/JIT/Generics/Typeof/class03.csproj
+++ b/tests/src/JIT/Generics/Typeof/class03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="class03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj b/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj
index 577e85f..10537cf 100644 (file)
--- a/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj
+++ b/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="dynamicTypes.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Typeof/objectBoxing.csproj b/tests/src/JIT/Generics/Typeof/objectBoxing.csproj
index 4ab303c..8864d86 100644 (file)
--- a/tests/src/JIT/Generics/Typeof/objectBoxing.csproj
+++ b/tests/src/JIT/Generics/Typeof/objectBoxing.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="objectBoxing.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj b/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj
index db2d008..cd2da6c 100644 (file)
--- a/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj
+++ b/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="refTypesdynamic.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Typeof/struct01.csproj b/tests/src/JIT/Generics/Typeof/struct01.csproj
index afc2bec..0844a73 100644 (file)
--- a/tests/src/JIT/Generics/Typeof/struct01.csproj
+++ b/tests/src/JIT/Generics/Typeof/struct01.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Typeof/struct02.csproj b/tests/src/JIT/Generics/Typeof/struct02.csproj
index 4c87846..75d4ce8 100644 (file)
--- a/tests/src/JIT/Generics/Typeof/struct02.csproj
+++ b/tests/src/JIT/Generics/Typeof/struct02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="Struct02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Typeof/struct03.csproj b/tests/src/JIT/Generics/Typeof/struct03.csproj
index e70d764..265c640 100644 (file)
--- a/tests/src/JIT/Generics/Typeof/struct03.csproj
+++ b/tests/src/JIT/Generics/Typeof/struct03.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct03.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj b/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj
index 8a4ed71..c4aa292 100644 (file)
--- a/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj
+++ b/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="valueTypeBoxing.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Generics/regression/DDB148379/ddb148379.ilproj b/tests/src/JIT/Generics/regression/DDB148379/ddb148379.ilproj
index 77034e7..3c5fd2f 100644 (file)
--- a/tests/src/JIT/Generics/regression/DDB148379/ddb148379.ilproj
+++ b/tests/src/JIT/Generics/regression/DDB148379/ddb148379.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ddb148379.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Base/add.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/add.ilproj
index c0781bd..19b969f 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Base/add.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/add.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="add.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.ilproj
index 6e8bd67..1a1acfc 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="conv_ovf_i1_un.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.ilproj
index 6aa3ad2..751fc58 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_add_ovf_i1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.ilproj
index ef4a75f..3b95eb0 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_add_ovf_i2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.ilproj
index 69dbb01..e81c1cf 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_add_ovf_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.ilproj
index 6aca53a..8ccdb4c 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_add_ovf_i8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.ilproj
index e35899f..68418ca 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_add_ovf_u1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.ilproj
index c3d008a..728dbd5 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_add_ovf_u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.ilproj
index 90a8042..376a54c 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_add_ovf_u4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.ilproj
index 76ea416..20712e2 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_add_ovf_u8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.ilproj
index e2779e7..0fb9ea2 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_c_cpblk.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.ilproj
index 74d2dcc..af26427 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_c_initblk.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.ilproj
index bd8ff54..6790340 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_c_nop.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.ilproj
index 11bd621..9773fe6 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_c_ret.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.ilproj
index c686fdc..de39ccf 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_c_switch.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.ilproj
index 6edfe1d..8a82e60 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_ckfinite_r4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.ilproj
index e97709d..dbf4335 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_ckfinite_r8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.ilproj
index 75d6b6f..4785816 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_i4_i1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.ilproj
index 01afc0a..6ea261b 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_i4_i2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.ilproj
index c06a21a..580a72c 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_i4_u4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.ilproj
index df77725..e5f5bb5 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_i8_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.ilproj
index 160338c..47d41ff 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_i8_u8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.ilproj
index bb5c4a7..531fc6b 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_r8_i.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.ilproj
index 5608f50..4d10c42 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_r8_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.ilproj
index 485d80e..795181b 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_r8_i8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.ilproj
index 013cf7d..907da04 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_u4_i.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.ilproj
index 3331a11..5b2680b 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_u4_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.ilproj
index e801583..a33bd3c 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_u4_u1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.ilproj
index 3ceff97..10d0445 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_u4_u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.ilproj
index 142dd02..ee5ee79 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_u8_i8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.ilproj
index 71967a9..04d11d4 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_conv_ovf_u8_u4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.ilproj
index 7145a75..5d0da0e 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mul_ovf_i1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.ilproj
index cc6918e..4fb3604 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mul_ovf_i2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.ilproj
index 60e80a3..9743d74 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mul_ovf_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.ilproj
index 1d83af3..568974b 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mul_ovf_i8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.ilproj
index d1435b3..5aefc96 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mul_ovf_u1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.ilproj
index cfbab47..1019e35 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mul_ovf_u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.ilproj
index f4e763c..59d948c 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mul_ovf_u4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.ilproj
index a6bb88e..12c3e7c 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mul_ovf_u8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.ilproj
index e440a76..a30ddae 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_neg_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.ilproj
index 4cfe666..5571ab5 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_neg_i8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.ilproj
index 2e48203..894861c 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_ret_i.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.ilproj
index 1c53e70..9c2fa90 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_ret_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.ilproj
index 74d4f6a..41d0324 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_ret_i8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.ilproj
index 878f86c..42d55c4 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_ret_r4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.ilproj
index 672129c..2f9de04 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_ret_r8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.ilproj
index 56091bc..bc9427d 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_ret_ref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.ilproj
index e41e9a8..37bfb28 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_sub_i.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.ilproj
index 1661c64..1eefe8d 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_sub_ovf_i1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.ilproj
index 10baf01..1c0a6bc 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_sub_ovf_i2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.ilproj
index b90f37d..1af23f3 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_sub_ovf_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.ilproj
index 4d1fd7c..c027344 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_sub_ovf_i8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.ilproj
index 368b1cd..ac83ae1 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_sub_ovf_u1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.ilproj
index 038460b..d9a35a3 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_sub_ovf_u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.ilproj
index bfb8613..1d13e24 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_sub_ovf_u4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.ilproj
index 1de8c3b..718692a 100644 (file)
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldc_sub_ovf_u8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Arrays/huge_struct.ilproj b/tests/src/JIT/Methodical/Arrays/huge_struct.ilproj
index cf23c08..507e28c 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/huge_struct.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge_struct.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="huge_struct.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj
index 6401f8a..158ae26 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj
index 1cd0824..bfe5fe4 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj
index d8b7cb9..8db26f9 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsbas.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj
index c8104a7..b547f34 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj
index 8802638..228e805 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsmax.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj
index d5f8497..a128877 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsmixed.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj
index 18232f0..f3f213f 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsval.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj
index c0ff58b..fcf1c68 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsvalbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_il_dbglcs_ldlen.ilproj b/tests/src/JIT/Methodical/Arrays/lcs/_il_dbglcs_ldlen.ilproj
index 6be3156..38ad40b 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_il_dbglcs_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_il_dbglcs_ldlen.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lcs_ldlen.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_il_rellcs_ldlen.ilproj b/tests/src/JIT/Methodical/Arrays/lcs/_il_rellcs_ldlen.ilproj
index d7e62da..96b43b1 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_il_rellcs_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_il_rellcs_ldlen.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lcs_ldlen.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj
index 6401f8a..158ae26 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj
index 1cd0824..bfe5fe4 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj
index d8b7cb9..8db26f9 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsbas.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj
index c8104a7..b547f34 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj
index 8802638..228e805 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsmax.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj
index d5f8497..a128877 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsmixed.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj
index 18232f0..f3f213f 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsval.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj
index c0ff58b..fcf1c68 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsvalbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj
index 88a0be1..d9b390a 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj
index 076530f..39bc175 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj
index 8ccc3df..2e0ad20 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsbas.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj
index b81374a..e656ffb 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj
index 97e14b0..bb42f3b 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsmax.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj
index 23983f9..9136d9c 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsmixed.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj
index c2a4d7d..4615b48 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsval.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj
index 1bfee56..f712fdd 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsvalbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj
index 88a0be1..d9b390a 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj
index 076530f..39bc175 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj
index 8ccc3df..2e0ad20 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsbas.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj
index b81374a..e656ffb 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj
index 97e14b0..bb42f3b 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsmax.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj
index 23983f9..9136d9c 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsmixed.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj
index c2a4d7d..4615b48 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsval.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj
index 1bfee56..f712fdd 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcsvalbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj b/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj
index 4ccd66c..15e993c 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="gcarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj b/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj
index cb3ab40..d8e1348 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="selfref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray_enum.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray_enum.ilproj
index 1dace87..773224b 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray_enum.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray_enum.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initializearray_enum.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbglengthm2.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbglengthm2.ilproj
index 84f1356..30bd02f 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbglengthm2.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbglengthm2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lengthm2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbgselfref.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbgselfref.ilproj
index c011a4c..5278922 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbgselfref.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbgselfref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="selfref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray_enum.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray_enum.ilproj
index add074b..8823665 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray_enum.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray_enum.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initializearray_enum.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_rellengthm2.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_rellengthm2.ilproj
index 09d03c4..63be6bb 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_rellengthm2.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_rellengthm2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lengthm2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_relselfref.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_relselfref.ilproj
index 8e9cdaf..d1121ac 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_relselfref.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_relselfref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="selfref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj b/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj
index 4ccd66c..15e993c 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="gcarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj b/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj
index cb3ab40..d8e1348 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="selfref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj b/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj
index fbf7fdd..860f995 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="gcarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj b/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj
index 2b35472..65a5aff 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="selfref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj b/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj
index fbf7fdd..860f995 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="gcarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj b/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj
index 2b35472..65a5aff 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="selfref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/misc/arrres.csproj b/tests/src/JIT/Methodical/Arrays/misc/arrres.csproj
index 4d44f56..f5b1203 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/misc/arrres.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/arrres.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arrres.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relnegIndexRngChkElim.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relnegIndexRngChkElim.ilproj
index 2584ef7..38ce4b0 100644 (file)
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relnegIndexRngChkElim.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relnegIndexRngChkElim.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="negIndexRngChkElim.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
index b9a90a8..8ba2712 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
index 0c24035..50fed37 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
index b9a90a8..8ba2712 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
index 0c24035..50fed37 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
index fc488ce..2fde029 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
index d892774..646fdb4 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
index fc488ce..2fde029 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
index d892774..646fdb4 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
index 9a9bca2..678a817 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
index e727f2e..52bc3b4 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
index 9a9bca2..678a817 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
index e727f2e..52bc3b4 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
index 24f33c2..be4ecac 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
index fd62df5..98a8490 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
index 24f33c2..be4ecac 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
index fd62df5..98a8490 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
index 4ad479e..4d11841 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
index 4be3201..4d26a1c 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
index 4ad479e..4d11841 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
index 4be3201..4d26a1c 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
index c423cc6..28a3a81 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
index 222161e..bdefc15 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
index c423cc6..28a3a81 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
index 222161e..bdefc15 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
index d23db5a..1a181ac 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
index 854b192..324b376 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
index d23db5a..1a181ac 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
index 854b192..324b376 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
index 09dd711..1ce3f8f 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
index 978deb5..3af46ba 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
index 09dd711..1ce3f8f 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
index 978deb5..3af46ba 100644 (file)
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8flat.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgarray.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgarray.ilproj
index 4a2f31b..fb52f91 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgarray.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgarray.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgchain.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgchain.ilproj
index fdbab81..7cbf0dc 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgchain.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgchain.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="chain.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocal.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocal.ilproj
index b85b42b..5538672 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocal.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocal.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="local.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relarray.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relarray.ilproj
index 7135ada..070a56c 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relarray.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relarray.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relchain.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relchain.ilproj
index 715284a..1dfbfa3 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relchain.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relchain.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="chain.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocal.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocal.ilproj
index dba33db..91dd0f1 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocal.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocal.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="local.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj
index 5d51228..817b6cd 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="enum.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_il.ilproj
index eaf0fb6..f107679 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_il.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="enum.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj
index bd0e0d4..cf26c0c 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="nestval.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj
index dfb4e1c..080486b 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="tailjump.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_il.ilproj
index 24fce9f..44766f6 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_il.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="tailjump.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj
index b93d797..b5df671 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="enum.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj
index 439ab86..da263d3 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="nestval.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj
index bb14385..f110d33 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="tailjump.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj
index b93d797..b5df671 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="enum.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj
index 439ab86..da263d3 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="nestval.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj
index bb14385..f110d33 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="tailjump.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj
index 5d51228..817b6cd 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="enum.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_relenum_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_relenum_il.ilproj
index 1a5bb9a..112e57e 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_relenum_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_relenum_il.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="enum.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj
index bd0e0d4..cf26c0c 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="nestval.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj
index dfb4e1c..080486b 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="tailjump.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_il.ilproj
index 784a84f..90fae18 100644 (file)
--- a/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_il.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="tailjump.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Coverage/b39946.ilproj b/tests/src/JIT/Methodical/Coverage/b39946.ilproj
index 498e66a..4ec8a2b 100644 (file)
--- a/tests/src/JIT/Methodical/Coverage/b39946.ilproj
+++ b/tests/src/JIT/Methodical/Coverage/b39946.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b39946.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Coverage/b433189.csproj b/tests/src/JIT/Methodical/Coverage/b433189.csproj
index 5811987..c95dc84 100644 (file)
--- a/tests/src/JIT/Methodical/Coverage/b433189.csproj
+++ b/tests/src/JIT/Methodical/Coverage/b433189.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b433189.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Coverage/b518440.ilproj b/tests/src/JIT/Methodical/Coverage/b518440.ilproj
index 18f52af..62024cd 100644 (file)
--- a/tests/src/JIT/Methodical/Coverage/b518440.ilproj
+++ b/tests/src/JIT/Methodical/Coverage/b518440.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b518440.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Coverage/hole.ilproj b/tests/src/JIT/Methodical/Coverage/hole.ilproj
index 71a7cba..1683693 100644 (file)
--- a/tests/src/JIT/Methodical/Coverage/hole.ilproj
+++ b/tests/src/JIT/Methodical/Coverage/hole.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="hole.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_i.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_i.ilproj
index 2603b0e..d48b123 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_i.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_i.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="conv_i8_i.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_u.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_u.ilproj
index a75e509..d7d6de8 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_u.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_u.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="conv_i8_u.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_i.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_i.ilproj
index fbd27ee..9732e87 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_i.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_i.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="convovf_i8_i.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_u.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_u.ilproj
index e6a6fba..7b4daac 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_u.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_u.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="convovf_i8_u-ia64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_conv.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_conv.ilproj
index 5555089..4ed7372 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_conv.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_conv.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_conv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_fld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_fld.ilproj
index b30b01b..443a606 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_fld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_fld.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_fld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flood.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flood.ilproj
index 6f84788..27f1885 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flood.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flood.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_flood.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flow.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flow.ilproj
index 792d66a..3ea9589 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flow.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flow.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_flow.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_prop.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_prop.ilproj
index 617491b..ebaa1f5 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_prop.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_prop.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_prop.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort1.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort1.ilproj
index db7cc4c..212edb8 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort1.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_qsort1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort2.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort2.ilproj
index 649685e..9504ac3 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort2.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_qsort2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_ref.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_ref.ilproj
index dd21719..3d81555 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_ref.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_ref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_ref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_seq.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_seq.ilproj
index be33c9a..a3f21b9 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_seq.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_seq.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_seq.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_vfld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_vfld.ilproj
index 842829d..d2c9685 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_vfld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_vfld.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_vfld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgptr.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgptr.ilproj
index 533b065..5a67abe 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgptr.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgptr.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ptr.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgqperm.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgqperm.ilproj
index 10e5b07..d4c2073 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgqperm.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgqperm.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="qperm.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
index dc1729c..8f349c3 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="sizeof-ia64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_conv.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_conv.ilproj
index eb07714..5a2620a 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_conv.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_conv.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_conv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_fld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_fld.ilproj
index daf520f..948a455 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_fld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_fld.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_fld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flood.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flood.ilproj
index fc38ebf..a2bf39e 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flood.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flood.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_flood.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flow.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flow.ilproj
index 10bdb83..c6628ad 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flow.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flow.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_flow.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_prop.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_prop.ilproj
index edbf6d9..edd7525 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_prop.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_prop.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_prop.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort1.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort1.ilproj
index 3252a5e..9791d93 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort1.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_qsort1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort2.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort2.ilproj
index 3a38afe..716b36b 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort2.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_qsort2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_ref.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_ref.ilproj
index c1eb8ef..ef42180 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_ref.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_ref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_ref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_seq.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_seq.ilproj
index 09c74ab..0a0cb7a 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_seq.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_seq.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_seq.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_vfld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_vfld.ilproj
index 98ee197..f9958bf 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_vfld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_vfld.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_vfld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_i.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_i.ilproj
index 029c881..3925232 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_i.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_i.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="conv_i8_i.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_u.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_u.ilproj
index 1b1fc06..2b1a330 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_u.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_u.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="conv_i8_u.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_i.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_i.ilproj
index 9c3c2fb..a3f163d 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_i.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_i.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="convovf_i8_i.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_u.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_u.ilproj
index c81d705..418534e 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_u.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_u.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="convovf_i8_u-ia64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_conv.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_conv.ilproj
index 32c977c..19d0c94 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_conv.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_conv.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_conv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_fld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_fld.ilproj
index 02a7cef..f85417c 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_fld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_fld.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_fld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flood.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flood.ilproj
index 9f8b4b0..abdb762 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flood.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flood.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_flood.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flow.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flow.ilproj
index 16f0c89..4da5295 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flow.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flow.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_flow.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_prop.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_prop.ilproj
index 7e6674d..e6a3fec 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_prop.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_prop.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_prop.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort1.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort1.ilproj
index de4919c..97d6ee0 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort1.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_qsort1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort2.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort2.ilproj
index 12809cc..8c4f6d2 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort2.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_qsort2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_ref.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_ref.ilproj
index bd512b2..9271837 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_ref.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_ref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_ref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_seq.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_seq.ilproj
index 76b6a3b..2b0a5aa 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_seq.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_seq.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_seq.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_vfld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_vfld.ilproj
index 30779ba..21a87ad 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_vfld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_vfld.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i_vfld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relptr.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relptr.ilproj
index ca83fc5..143c8a8 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relptr.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relptr.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ptr.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relqperm.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relqperm.ilproj
index 26dc110..19ee4fe 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relqperm.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relqperm.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="qperm.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
index 71e7b4e..f03d0de 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="sizeof-ia64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_conv.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_conv.ilproj
index 158fb02..4728d34 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_conv.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_conv.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_conv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_fld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_fld.ilproj
index b63adfe..7da631d 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_fld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_fld.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_fld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flood.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flood.ilproj
index ca3cbb8..c2e8f46 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flood.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flood.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_flood.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flow.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flow.ilproj
index 89b511a..ce7a77f 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flow.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flow.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_flow.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_prop.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_prop.ilproj
index cb78f85..8b28064 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_prop.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_prop.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_prop.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort1.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort1.ilproj
index 3b60084..c005155 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort1.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_qsort1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort2.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort2.ilproj
index 9125f2e..cec0441 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort2.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_qsort2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_ref.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_ref.ilproj
index 96d2c2e..788274b 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_ref.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_ref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_ref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_seq.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_seq.ilproj
index 5e5b7ed..2d3e4ae 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_seq.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_seq.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_seq.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_vfld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_vfld.ilproj
index f2a3f3e..e315bf8 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_vfld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_vfld.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_vfld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_merge.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_merge.ilproj
index c45536b..4269fc4 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_merge.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_merge.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="i_flow_merge.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_merge.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_merge.ilproj
index 9d1003b..b3d1bca 100644 (file)
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_merge.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_merge.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="u_flow_merge.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
index ef4407c..90ad4db 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="convr4a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
index a9f01a9..79ff4c4 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="convr4a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
index ef4407c..90ad4db 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="convr4a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
index a9f01a9..79ff4c4 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="convr4a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj b/tests/src/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
index 6f1362f..2307139 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="convr4d.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj b/tests/src/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
index fb1be0f..948c6af 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="convr4d.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
index a3a365b..ddacd3f 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="convr8a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
index 67df790..d47977c 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="convr8a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
index a3a365b..ddacd3f 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="convr8a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
index 67df790..d47977c 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="convr8a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj b/tests/src/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
index d1e82bc..231b480 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="convr8d.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj b/tests/src/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
index 74e7ccd..52f4018 100644 (file)
--- a/tests/src/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="convr8d.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
index 1e5c5fe..953b90e 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param1a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
index bf9a721..f06519f 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param1a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
index 1e5c5fe..953b90e 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param1a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
index bf9a721..f06519f 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param1a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
index a773b51..7cf5703 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="25param1b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
index 4721bab..ff7b722 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="25param1b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
index f8cf9a7..4050ba3 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="25param1c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
index 63429d9..04602e0 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="25param1c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
index a230ed3..07ee296 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param2a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
index 47a4a40..194ca80 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param2a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
index a230ed3..07ee296 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param2a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
index 47a4a40..194ca80 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param2a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
index 4964e84..0606ac3 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param3a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
index c953dcb..39d319f 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param3a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
index 4964e84..0606ac3 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param3a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
index c953dcb..39d319f 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="25param3a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
index e58960c..c0e03e0 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="25param3b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
index c7fb726..3c78282 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="25param3b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
index cca8bd1..b52957e 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="25param3c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
index 5d793e6..20b0677 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="25param3c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
index 7b746eb..0a31994 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="25paramMixed.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
index 14b2e92..0ad00b5 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="25paramMixed.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj
index 9896236..004c737 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="catchfinally.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj
index 1a9d2b6..3c0e61e 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="catchfinally_tail.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault.ilproj
index 1431ffa..09e4f4f 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfault.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_jmp.ilproj
index 4f8fdcc..06c0537 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_jmp.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfault_jmp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_tail.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_tail.ilproj
index 8e4a1af..c663d33 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_tail.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_tail.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfault_tail.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_ind.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_ind.ilproj
index c8b08f4..c3b4dc1 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_ind.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_ind.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfinally_ind.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmp.ilproj
index ab456c5..c7b26b5 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmp.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfinally_jmp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmpind.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmpind.ilproj
index 36d184a..cd7ad87 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmpind.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmpind.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfinally_jmpind.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_tail.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_tail.ilproj
index 3b2b65b..380d60d 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_tail.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_tail.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfinally_tail.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault.ilproj
index 2ffb7dd..c7adbd4 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfault.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_jmp.ilproj
index 2be4c16..8d1472f 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_jmp.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfault_jmp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_tail.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_tail.ilproj
index f74d4ec..9ac4626 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_tail.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_tail.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfault_tail.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_ind.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_ind.ilproj
index 350af6a..e2d8952 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_ind.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_ind.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfinally_ind.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmp.ilproj
index c1921cc..3a51d24 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmp.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfinally_jmp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmpind.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmpind.ilproj
index e175ed0..19b53eb 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmpind.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmpind.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfinally_jmpind.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_tail.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_tail.ilproj
index 3da2792..2bb8112 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_tail.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_tail.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="catchfinally_tail.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj
index 9896236..004c737 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="catchfinally.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj
index 1a9d2b6..3c0e61e 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="catchfinally_tail.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj
index 04177da..4c7221f 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="catchfinally.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj
index b85cf94..981c1c8 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="catchfinally_tail.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj
index 04177da..4c7221f 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="catchfinally.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj
index b85cf94..981c1c8 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="catchfinally_tail.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj b/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj
index 6dc2d8c..c6b6dea 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest1.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest1.ilproj
index 87b6a4b..3878b07 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest2.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest2.ilproj
index 3f14c7f..183c21b 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest3.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest3.ilproj
index 6a0ff1c..6a9ff08 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest3.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest3.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest1.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest1.ilproj
index e9d485f..d40c5e5 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest2.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest2.ilproj
index 2513a32..d232c93 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest3.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest3.ilproj
index 6ea1c7c..77ac3ec 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest3.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest3.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj b/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj
index 6dc2d8c..c6b6dea 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj b/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj
index 81b3c3a..40fb927 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj b/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj
index 81b3c3a..40fb927 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj b/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj
index 68b4a2d..945cc33 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="val_ctor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_cctor.ilproj b/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_cctor.ilproj
index 0b9ba73..3a16f1d 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_cctor.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_cctor.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="val_cctor.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_ctor_newobj.ilproj b/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_ctor_newobj.ilproj
index 0f6d649..2d89510 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_ctor_newobj.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_ctor_newobj.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="val_ctor_newobj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_cctor.ilproj b/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_cctor.ilproj
index 401c33d..9904c00 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_cctor.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_cctor.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="val_cctor.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_ctor_newobj.ilproj b/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_ctor_newobj.ilproj
index c161d7c..cba4bcc 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_ctor_newobj.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_ctor_newobj.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="val_ctor_newobj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj b/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj
index 68b4a2d..945cc33 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="val_ctor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj b/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj
index 5abd8dc..27aa094 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="val_ctor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj b/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj
index 5abd8dc..27aa094 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="val_ctor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj b/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj
index e4fe405..4e5274b 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="deep.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep1.ilproj b/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep1.ilproj
index 1193a91..6088bbf 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep2.ilproj b/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep2.ilproj
index 1a623db..fa242a3 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep1.ilproj b/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep1.ilproj
index 68b9203..f6fa977 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep2.ilproj b/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep2.ilproj
index ffa23d4..d239307 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj b/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj
index e4fe405..4e5274b 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="deep.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj b/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj
index 6bbfd3f..a7c1383 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="deep.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj b/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj
index 6bbfd3f..a7c1383 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="deep.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj b/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj
index bf62553..cc7a5ec 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="recurse.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgftn_t.ilproj
index 99993c6..a79d814 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgftn_t.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ftn_t.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn.ilproj
index 43c37f3..2c872f3 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="instftn.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn_t.ilproj
index 569970d..a8ea12c 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn_t.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="instftn_t.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_calli.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_calli.ilproj
index 0a1bb30..29567a5 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_calli.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_calli.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_calli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmp.ilproj
index 3c64322..d3c2d2e 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmp.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_jmp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmpi.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmpi.ilproj
index e8ea320..105371f 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmpi.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmpi.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_jmpi.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_call.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_call.ilproj
index 0eb1cdf..8227e6b 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_call.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_call.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_tail_call.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_calli.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_calli.ilproj
index 88b9091..2f066e2 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_calli.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_calli.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_tail_calli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn.ilproj
index e480ee9..474d980 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="valftn.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn_t.ilproj
index 8c8befa..254c236 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn_t.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="valftn_t.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn.ilproj
index 0e9395a..c58662c 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="virtftn.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn_t.ilproj
index d0bd11c..925130d 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn_t.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="virtftn_t.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relftn_t.ilproj
index 8b585f4..fd1075f 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relftn_t.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ftn_t.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn.ilproj
index 0523de3..f686124 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="instftn.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn_t.ilproj
index 7f5f700..50ffdf8 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn_t.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="instftn_t.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_calli.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_calli.ilproj
index 6992689..8e03576 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_calli.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_calli.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_calli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmp.ilproj
index 99e3969..b474a11 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmp.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_jmp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmpi.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmpi.ilproj
index b6fbd35..6159795 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmpi.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmpi.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_jmpi.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_call.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_call.ilproj
index 24d79cc..2e007f7 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_call.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_call.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_tail_call.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_calli.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_calli.ilproj
index bcecb67..06b40ca 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_calli.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_calli.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_tail_calli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn.ilproj
index 2e632b4..7417906 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="valftn.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn_t.ilproj
index e7f35cb..8f4eab2 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn_t.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="valftn_t.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn.ilproj
index 7e11d78..3f3b054 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="virtftn.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn_t.ilproj
index 78f1f01..afcfe5d 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn_t.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="virtftn_t.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj b/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj
index bf62553..cc7a5ec 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="recurse.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj b/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj
index e7b4732..9d96c75 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="recurse.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj b/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj
index e7b4732..9d96c75 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="recurse.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj b/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj
index a8e0bf4..0e37b72 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="obj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr4.ilproj
index b645faa..354939a 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fr4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr8.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr8.ilproj
index 29f0cb8..4cb9b12 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr8.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fr8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u2.ilproj
index 2f5d81e..d2f5467 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i4u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u4.ilproj
index 29ee46f..459e6c5 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i4u4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi8u8.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi8u8.ilproj
index 6e97477..0dbcb76 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi8u8.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi8u8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i8u8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii1.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii1.ilproj
index 3a2e9db..b931d34 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ii1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii2.ilproj
index cda594b..1ed5fab 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ii2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii4.ilproj
index f59bbac..8fe38d1 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ii4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu2.ilproj
index 6d51300..1dc1cba 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="iu2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu4.ilproj
index c705c16..06a906e 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="iu4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgobjref.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgobjref.ilproj
index bfc0c81..9d68553 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgobjref.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgobjref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="objref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr4.ilproj
index 9ea2dae..8b8f4df 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fr4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr8.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr8.ilproj
index d1e2a0c..3636efb 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr8.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fr8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u2.ilproj
index 5dcfb55..68d2948 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i4u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u4.ilproj
index 0a50965..dd2f62c 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i4u4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli8u8.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli8u8.ilproj
index b56b662..09c0ce4 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli8u8.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli8u8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="i8u8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii1.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii1.ilproj
index 0cb4165..d5b0c03 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ii1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii2.ilproj
index 4dcf2ec..2885f5e 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ii2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii4.ilproj
index 03f67c0..07ba324 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ii4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu2.ilproj
index e3dc64f..ac07a08 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="iu2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu4.ilproj
index 448e844..d4ec0f3 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="iu4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relobjref.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relobjref.ilproj
index bf1cb0f..6f03995 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relobjref.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relobjref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="objref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj b/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj
index a8e0bf4..0e37b72 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="obj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj b/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj
index cf602df..d6c8d83 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="obj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj b/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj
index cf602df..d6c8d83 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="obj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Invoke/thiscall/_dbgthisnull.ilproj b/tests/src/JIT/Methodical/Invoke/thiscall/_dbgthisnull.ilproj
index abda903..5dc1b1c 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/thiscall/_dbgthisnull.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/thiscall/_dbgthisnull.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="thisnull.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/thiscall/_relthisnull.ilproj b/tests/src/JIT/Methodical/Invoke/thiscall/_relthisnull.ilproj
index d720986..06cfbe5 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/thiscall/_relthisnull.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/thiscall/_relthisnull.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="thisnull.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/thiscall/_speed_dbgthisnull.ilproj b/tests/src/JIT/Methodical/Invoke/thiscall/_speed_dbgthisnull.ilproj
index abda903..5dc1b1c 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/thiscall/_speed_dbgthisnull.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/thiscall/_speed_dbgthisnull.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="thisnull.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/Invoke/thiscall/_speed_relthisnull.ilproj b/tests/src/JIT/Methodical/Invoke/thiscall/_speed_relthisnull.ilproj
index d720986..06cfbe5 100644 (file)
--- a/tests/src/JIT/Methodical/Invoke/thiscall/_speed_relthisnull.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/thiscall/_speed_relthisnull.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="thisnull.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
index 098f63c..79e80a9 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="bool.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
index a704f74..274674e 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="bool.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
index 098f63c..79e80a9 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="bool.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
index a704f74..274674e 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="bool.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
index 33deb54..206e92a 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="byte.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
index 6adcb23..353a1f1 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="byte.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
index 33deb54..206e92a 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="byte.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
index 6adcb23..353a1f1 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="byte.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
index 2c64a7f..9464cd3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="char.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
index 7328f42..af42b02 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="char.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
index 2c64a7f..9464cd3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="char.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
index 7328f42..af42b02 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="char.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
index 1cb6980..49fd9f3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimal.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
index d2e90f4..92022af 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimal.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
index 1cb6980..49fd9f3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimal.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
index d2e90f4..92022af 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimal.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
index 6db4208..3c8605b 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="double.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
index 7566f73..d333b11 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="double.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
index 6db4208..3c8605b 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="double.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
index 7566f73..d333b11 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="double.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
index 50b9972..87b9629 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="float.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
index bef8dc3..d475173 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="float.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
index 50b9972..87b9629 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="float.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
index bef8dc3..d475173 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="float.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
index d5e7870..6e13554 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
index aa8fdba..bab9a32 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
index d5e7870..6e13554 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
index aa8fdba..bab9a32 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="int.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
index afefa57..317cb9e 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="long.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
index 282da27..c186150 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="long.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
index afefa57..317cb9e 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="long.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
index 282da27..c186150 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="long.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
index 7c85b1a..a19db1a 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="sbyte.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
index b4e27f1..3ea1862 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="sbyte.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
index 7c85b1a..a19db1a 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="sbyte.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
index b4e27f1..3ea1862 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="sbyte.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
index 47471e0..56a4873 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="short.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
index d3b478e..12fb2aa 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="short.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
index 47471e0..56a4873 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="short.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
index d3b478e..12fb2aa 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="short.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
index 7c36b1b..08dc164 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
index 804e1c8..ac6fb98 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
index 7c36b1b..08dc164 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
index 804e1c8..ac6fb98 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="uint.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
index f1f611a..dc868a1 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ulong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
index ed4a0dc..5bc53bc 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ulong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
index f1f611a..dc868a1 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ulong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
index ed4a0dc..5bc53bc 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ulong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
index 0aec419..cca60a2 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ushort.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
index c0f1c15..3fc7c4e 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ushort.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
index 0aec419..cca60a2 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ushort.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
index c0f1c15..3fc7c4e 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ushort.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj
index 58aa9c4..e0573f3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj
index e35d0a6..396c535 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj
index 58aa9c4..e0573f3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj
index e35d0a6..396c535 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj
index f9a2641..1058d25 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj
index da18421..c330fd6 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj
index f9a2641..1058d25 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj
index da18421..c330fd6 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
index f654005..fee2299 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="plainarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
index 71ca9f3..0b0ea17 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="plainarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
index f654005..fee2299 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="plainarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
index 71ca9f3..0b0ea17 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="plainarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj
index 5e9948b..6996029 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj
index 5c01b92..00c0960 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj
index 5e9948b..6996029 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj
index 5c01b92..00c0960 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj
index 58aa9c4..e0573f3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj
index e35d0a6..396c535 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj
index 58aa9c4..e0573f3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj
index e35d0a6..396c535 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj
index c9f6ac2..a6638c3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="doublearr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj
index bd3f782..a5ef50b 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="doublearr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj
index c9f6ac2..a6638c3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="doublearr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj
index bd3f782..a5ef50b 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="doublearr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
index c23ae3a..98fb51d 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="intarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
index 60c02ac..f9111db 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="intarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
index c23ae3a..98fb51d 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="intarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
index 60c02ac..f9111db 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="intarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj
index f9a2641..1058d25 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj
index da18421..c330fd6 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj
index f9a2641..1058d25 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj
index da18421..c330fd6 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj
index e395698..1321927 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="stringarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj
index 24a1a1c..ff63cee 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="stringarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj
index e395698..1321927 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="stringarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj
index 24a1a1c..ff63cee 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="stringarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj
index 5e9948b..6996029 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj
index 5c01b92..00c0960 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj
index 5e9948b..6996029 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj
index 5c01b92..00c0960 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj
index 58aa9c4..e0573f3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj
index e35d0a6..396c535 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj
index 58aa9c4..e0573f3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj
index e35d0a6..396c535 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj
index c9f6ac2..a6638c3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="doublearr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj
index bd3f782..a5ef50b 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="doublearr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj
index c9f6ac2..a6638c3 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="doublearr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj
index bd3f782..a5ef50b 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="doublearr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj
index f9a2641..1058d25 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj
index da18421..c330fd6 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj
index f9a2641..1058d25 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj
index da18421..c330fd6 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jaggedarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj
index e395698..1321927 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="stringarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj
index 24a1a1c..ff63cee 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="stringarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj
index e395698..1321927 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="stringarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj
index 24a1a1c..ff63cee 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="stringarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj
index 5e9948b..6996029 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj
index 5c01b92..00c0960 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj
index 5e9948b..6996029 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj
index 5c01b92..00c0960 100644 (file)
--- a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structarr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj b/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj
index aa8317a..4890fbe 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj b/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj
index 0d202e7..0731f79 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj b/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj
index aa8317a..4890fbe 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj
index 0d202e7..0731f79 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm32_d.csproj b/tests/src/JIT/Methodical/NaN/arithm32_d.csproj
index aa8317a..4890fbe 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm32_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm32_do.csproj b/tests/src/JIT/Methodical/NaN/arithm32_do.csproj
index 0d202e7..0731f79 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm32_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm32_r.csproj b/tests/src/JIT/Methodical/NaN/arithm32_r.csproj
index aa8317a..4890fbe 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm32_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj b/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj
index 0d202e7..0731f79 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj b/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj
index b504995..d9448eb 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj b/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj
index 8306e25..5454b29 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj b/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj
index b504995..d9448eb 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj
index 8306e25..5454b29 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm64_d.csproj b/tests/src/JIT/Methodical/NaN/arithm64_d.csproj
index b504995..d9448eb 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm64_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm64_do.csproj b/tests/src/JIT/Methodical/NaN/arithm64_do.csproj
index 8306e25..5454b29 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm64_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm64_r.csproj b/tests/src/JIT/Methodical/NaN/arithm64_r.csproj
index b504995..d9448eb 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm64_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj b/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj
index 8306e25..5454b29 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arithm64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/comp32_il_d.ilproj b/tests/src/JIT/Methodical/NaN/comp32_il_d.ilproj
index 5e24397..062eed9 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/comp32_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/comp32_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="comp32.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/NaN/comp32_il_r.ilproj b/tests/src/JIT/Methodical/NaN/comp32_il_r.ilproj
index 9172f65..72e341c 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/comp32_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/comp32_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="comp32.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/NaN/comp64_il_d.ilproj b/tests/src/JIT/Methodical/NaN/comp64_il_d.ilproj
index f3b8e00..07c13cc 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/comp64_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/comp64_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="comp64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/NaN/comp64_il_r.ilproj b/tests/src/JIT/Methodical/NaN/comp64_il_r.ilproj
index 297c593..a15f4ea 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/comp64_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/comp64_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="comp64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/NaN/cond32_il_d.ilproj b/tests/src/JIT/Methodical/NaN/cond32_il_d.ilproj
index c83137a..c782802 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/cond32_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/cond32_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cond32.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/NaN/cond32_il_r.ilproj b/tests/src/JIT/Methodical/NaN/cond32_il_r.ilproj
index 177119d..7767a3e 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/cond32_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/cond32_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cond32.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/NaN/cond64_il_d.ilproj b/tests/src/JIT/Methodical/NaN/cond64_il_d.ilproj
index 82dbb68..dd5c9bc 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/cond64_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/cond64_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cond64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/NaN/cond64_il_r.ilproj b/tests/src/JIT/Methodical/NaN/cond64_il_r.ilproj
index 98ae56e..1f7ba21 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/cond64_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/cond64_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cond64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
index 9b6051b..27ec175 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
index f784c7b..40bbb7f 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
index 9b6051b..27ec175 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
index f784c7b..40bbb7f 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
index d67641e..0caa0e7 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNdiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
index 8eb2a01..c6dda5a 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNdiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
index d67641e..0caa0e7 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNdiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
index 8eb2a01..c6dda5a 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNdiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
index b033bea..6da18bd 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
index 03d463a..288d871 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
index b033bea..6da18bd 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
index 03d463a..288d871 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
index 214433e..160938e 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
index 70cf274..74a7aa6 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
index 214433e..160938e 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
index 70cf274..74a7aa6 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
index c7a023b..5f7ef58 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
index a0d24d7..053d0fe 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
index c7a023b..5f7ef58 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
index a0d24d7..053d0fe 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4NaNsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
index 003eb9d..eb7c8e3 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
index 670305f..d6e3eb3 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
index 003eb9d..eb7c8e3 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
index 670305f..d6e3eb3 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNadd.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
index 7dddb27..36053a4 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNdiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
index 146e8d1..ef780d5 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNdiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
index 7dddb27..36053a4 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNdiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
index 146e8d1..ef780d5 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNdiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
index 8467de4..3c6ecba 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
index 8f957e0..1cca908 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
index 8467de4..3c6ecba 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
index 8f957e0..1cca908 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNmul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
index 148f920..fc5acaa 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
index 7f4e2cf..40f8684 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
index 148f920..fc5acaa 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
index 7f4e2cf..40f8684 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
index 353964b..b0f7e61 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
index e9d1b7a..eeeda57 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
index 353964b..b0f7e61 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
index e9d1b7a..eeeda57 100644 (file)
--- a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8NaNsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
index 01389be..30e6dcf 100644 (file)
--- a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="FloatInfinitiesToInt.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
index 213fe62..a9b42d2 100644 (file)
--- a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="FloatInfinitiesToInt.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
index 01389be..30e6dcf 100644 (file)
--- a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="FloatInfinitiesToInt.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
index 213fe62..a9b42d2 100644 (file)
--- a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="FloatInfinitiesToInt.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
index 3dc1081..60e38dd 100644 (file)
--- a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="FloatOvfToInt2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
index bc7d795..72e5239 100644 (file)
--- a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="FloatOvfToInt2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
index 3dc1081..60e38dd 100644 (file)
--- a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="FloatOvfToInt2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
index bc7d795..72e5239 100644 (file)
--- a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="FloatOvfToInt2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj
index cd9d109..471b55f 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj
index 79707a3..3594575 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jumper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj
index 211762c..b48c457 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jumps.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj
index 23ff391..af447e4 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vtret.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgaa.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgaa.ilproj
index 84e05c7..90f066a 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgaa.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgaa.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="aa.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgcalli.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgcalli.ilproj
index 46d65cd..cc42d42 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgcalli.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgcalli.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="calli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgdd.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgdd.ilproj
index be06676..fd4cba3 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgdd.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgdd.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="dd.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgee.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgee.ilproj
index 67064b4..1c03a02 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgee.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgee.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ee.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper1.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper1.ilproj
index 0edb3f9..15339c5 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper1.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jumper1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper2.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper2.ilproj
index b6618fa..60241af 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper2.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jumper2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper3.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper3.ilproj
index 3a1f9b4..a3d9174 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper3.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper3.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jumper3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper4.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper4.ilproj
index e26fc2b..ba2781f 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper4.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jumper4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper5.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper5.ilproj
index c8be54c..031e59e 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper5.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper5.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jumper5.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret.ilproj
index b9a58a3..2d38c28 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vtret.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret2.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret2.ilproj
index 12ce556..0f750f5 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret2.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vtret2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_relaa.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_relaa.ilproj
index 3bec0a6..c2a91e7 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_relaa.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_relaa.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="aa.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_relcalli.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_relcalli.ilproj
index c81f298..8f1ba60 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_relcalli.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_relcalli.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="calli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reldd.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reldd.ilproj
index 6d23bea..997cffa 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reldd.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reldd.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="dd.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_relee.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_relee.ilproj
index e6614d8..88cb81a 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_relee.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_relee.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ee.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper1.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper1.ilproj
index 5583303..a3467f5 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper1.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jumper1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper2.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper2.ilproj
index 294c268..036c69e 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper2.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jumper2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper3.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper3.ilproj
index 7f1efdd..2116d78 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper3.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper3.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jumper3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper4.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper4.ilproj
index c57995b..2cfbae7 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper4.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jumper4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper5.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper5.ilproj
index 8856326..a19f188 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper5.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper5.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jumper5.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_relvtret.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_relvtret.ilproj
index 98874f7..5a9dd87 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_relvtret.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_relvtret.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vtret.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_relvtret2.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_relvtret2.ilproj
index b41484a..b61c3f1 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_il_relvtret2.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_relvtret2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vtret2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj
index cd9d109..471b55f 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj
index 79707a3..3594575 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jumper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj
index 211762c..b48c457 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jumps.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj
index 23ff391..af447e4 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vtret.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj
index 981f887..4f9a7a1 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj
index ed45279..d6f15ee 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jumper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj
index 7d2e240..f6b6526 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jumps.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj
index 64da839..d6963bc 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vtret.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj
index 981f887..4f9a7a1 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj
index ed45279..d6f15ee 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jumper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj
index 7d2e240..f6b6526 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="jumps.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj
index 64da839..d6963bc 100644 (file)
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vtret.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj
index ba4e071..c752600 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ctor_recurse.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj
index 609f3d8..37e636c 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj
index e8ad08f..372702a 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj
index 76afc1b..4f77e9d 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3_ctor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj
index 3912151..4587119 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3_ref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj
index 5b3d75f..b09b880 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="hanoi.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj
index 8392e80..973cca4 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="knight.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj
index ba4e071..c752600 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ctor_recurse.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj
index 609f3d8..37e636c 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj
index e8ad08f..372702a 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj
index 76afc1b..4f77e9d 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3_ctor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj
index 3912151..4587119 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3_ref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj
index 5b3d75f..b09b880 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="hanoi.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_relknight.csproj b/tests/src/JIT/Methodical/VT/etc/_relknight.csproj
index 8392e80..973cca4 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_relknight.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relknight.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="knight.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj
index 7458bfc..ace5d55 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ctor_recurse.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj
index ca9de49..f07647e 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj
index 076338b..714c4a9 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj
index 8b2533c..bdd213e 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3_ctor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj
index 9b47f17..847831e 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3_ref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj
index 3150d2b..ce08986 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="hanoi.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj
index 4e8c992..011a4da 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="knight.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj
index 7458bfc..ace5d55 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ctor_recurse.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj
index ca9de49..f07647e 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj
index 076338b..714c4a9 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj
index 8b2533c..bdd213e 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3_ctor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj
index 9b47f17..847831e 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="han3_ref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj
index 3150d2b..ce08986 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="hanoi.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj
index 4e8c992..011a4da 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="knight.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj
index a3a371b..4072458 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj
@@ -14,7 +14,7 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <ResolveNuGetPackages>false</ResolveNuGetPackages>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,7 +40,8 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/etc/nested.csproj b/tests/src/JIT/Methodical/VT/etc/nested.csproj
index 580a40b..6da67b9 100644 (file)
--- a/tests/src/JIT/Methodical/VT/etc/nested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/nested.csproj
@@ -14,7 +14,7 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <ResolveNuGetPackages>false</ResolveNuGetPackages>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,14 +34,15 @@
     <Compile Include="nested.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj
index e58c1e7..0477853 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="accum.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj
index 36b9f2d..a3cbe07 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vcall.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/identity/_il_dbgaccum.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_dbgaccum.ilproj
index f191a2e..94e5b0d 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_il_dbgaccum.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_dbgaccum.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="accum.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/identity/_il_dbglivecall.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_dbglivecall.ilproj
index ba1f66e..70b7998 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_il_dbglivecall.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_dbglivecall.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="livecall.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/identity/_il_dbgvolatile.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_dbgvolatile.ilproj
index 11fa7de..c1251c7 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_il_dbgvolatile.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_dbgvolatile.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="volatile.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/identity/_il_relaccum.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_relaccum.ilproj
index aa75f14..65687a6 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_il_relaccum.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_relaccum.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="accum.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/identity/_il_rellivecall.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_rellivecall.ilproj
index 7969488..2738134 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_il_rellivecall.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_rellivecall.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="livecall.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/identity/_il_relvolatile.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_relvolatile.ilproj
index bc5f28d..20f4229 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_il_relvolatile.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_relvolatile.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="volatile.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj
index e58c1e7..0477853 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="accum.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj
index 36b9f2d..a3cbe07 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vcall.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj
index caeecbc..49251dc 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="accum.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj
index 6d6ea5f..dd5aac5 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vcall.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj
index caeecbc..49251dc 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="accum.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj
index 6d6ea5f..dd5aac5 100644 (file)
--- a/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vcall.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj b/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj
index 6401f8a..158ae26 100644 (file)
--- a/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj
index 30f481a..82fa250 100644 (file)
--- a/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_gcref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/port/_rellcs.csproj b/tests/src/JIT/Methodical/VT/port/_rellcs.csproj
index 6401f8a..158ae26 100644 (file)
--- a/tests/src/JIT/Methodical/VT/port/_rellcs.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_rellcs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj
index 30f481a..82fa250 100644 (file)
--- a/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_gcref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj
index 88a0be1..d9b390a 100644 (file)
--- a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj
index f755f58..f1ee65e 100644 (file)
--- a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_gcref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj b/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj
index 88a0be1..d9b390a 100644 (file)
--- a/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj
index f755f58..f1ee65e 100644 (file)
--- a/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_gcref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj b/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj
index 38f088d..800d2c6 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="cast_throw.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj b/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj
index 4798288..c4f4e36 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="throw.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch.ilproj
index 5a37b45..95ee150 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_catch.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch_neg.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch_neg.ilproj
index 62aa719..b6daf6a 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch_neg.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch_neg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_catch_neg.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_dbgfilter.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_dbgfilter.ilproj
index a249ea6..86c35bb 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_il_dbgfilter.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_dbgfilter.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="filter.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch.ilproj
index c22d964..b968e2d 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_catch.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch_neg.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch_neg.ilproj
index 684e80f..28ac696 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch_neg.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch_neg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_catch_neg.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch.ilproj
index 3da7e4c..8bf0c19 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_catch.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch_neg.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch_neg.ilproj
index 4f507a4..bb39131 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch_neg.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch_neg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_catch_neg.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_relfilter.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_relfilter.ilproj
index d2285a4..5ee66d8 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_il_relfilter.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_relfilter.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="filter.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch.ilproj
index b40298a..747fcac 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_catch.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch_neg.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch_neg.ilproj
index 405a8eb..61a7ede 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch_neg.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch_neg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_catch_neg.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj b/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj
index 38f088d..800d2c6 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="cast_throw.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj b/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj
index 4798288..c4f4e36 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="throw.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj b/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj
index 2547bc6..1001bec 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="cast_throw.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj b/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj
index 2c0ea45..5370c9c 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="throw.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj b/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj
index 2547bc6..1001bec 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="cast_throw.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj b/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj
index 2c0ea45..5370c9c 100644 (file)
--- a/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="throw.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/array/_il_dbgarrays.ilproj b/tests/src/JIT/Methodical/casts/array/_il_dbgarrays.ilproj
index 6dbc15e..6f05987 100644 (file)
--- a/tests/src/JIT/Methodical/casts/array/_il_dbgarrays.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_dbgarrays.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="arrays.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/array/_il_dbgcastclass_ldlen.ilproj b/tests/src/JIT/Methodical/casts/array/_il_dbgcastclass_ldlen.ilproj
index d613c0f..6fbac1a 100644 (file)
--- a/tests/src/JIT/Methodical/casts/array/_il_dbgcastclass_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_dbgcastclass_ldlen.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_ldlen.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/array/_il_dbgisinst_ldlen.ilproj b/tests/src/JIT/Methodical/casts/array/_il_dbgisinst_ldlen.ilproj
index 4c2df00..c57dd29 100644 (file)
--- a/tests/src/JIT/Methodical/casts/array/_il_dbgisinst_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_dbgisinst_ldlen.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_ldlen.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/array/_il_relarrays.ilproj b/tests/src/JIT/Methodical/casts/array/_il_relarrays.ilproj
index ff59340..9c9e4d8 100644 (file)
--- a/tests/src/JIT/Methodical/casts/array/_il_relarrays.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_relarrays.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="arrays.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/array/_il_relcastclass_ldlen.ilproj b/tests/src/JIT/Methodical/casts/array/_il_relcastclass_ldlen.ilproj
index 69ac405..6a30b04 100644 (file)
--- a/tests/src/JIT/Methodical/casts/array/_il_relcastclass_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_relcastclass_ldlen.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_ldlen.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/array/_il_relisinst_ldlen.ilproj b/tests/src/JIT/Methodical/casts/array/_il_relisinst_ldlen.ilproj
index 501e9cf..ff1450b 100644 (file)
--- a/tests/src/JIT/Methodical/casts/array/_il_relisinst_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_relisinst_ldlen.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_ldlen.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj
index 873857f..e8806b2 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj
index 027bcd3..48ce50f 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_ldarg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj
index 346926d..8a2b9fa 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_ldloc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj
index 4500070..345d114 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_newobj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj
index 6eb52c5..15cbca1 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj
index f6d3e0f..42ae599 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_ldarg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj
index f26e9f9..fcd9891 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_ldloc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj
index ff11f7f..39cac57 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_newobj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_call.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_call.ilproj
index c75afa1..7effc76 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_call.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_call.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_call.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_calli.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_calli.ilproj
index 493ca37..b76497e 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_calli.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_calli.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_calli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldarg.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldarg.ilproj
index f5396e0..acaf353 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldarg.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldarg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_ldarg.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldloc.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldloc.ilproj
index bbe50b4..2361584 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldloc.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldloc.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_ldloc.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_call.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_call.ilproj
index 9bc0948..be29831 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_call.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_call.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_call.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_calli.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_calli.ilproj
index 737b4b4..f91d273 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_calli.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_calli.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_calli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldarg.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldarg.ilproj
index a73c787..8d3e42f 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldarg.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldarg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_ldarg.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldloc.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldloc.ilproj
index 094d4d7..5700068 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldloc.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldloc.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_ldloc.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgldnull.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgldnull.ilproj
index 0d4facf..5092811 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgldnull.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgldnull.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldnull.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_call.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_call.ilproj
index ee7ea1f..893b938 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_call.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_call.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_call.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_calli.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_calli.ilproj
index 8ddc277..48e4ae7 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_calli.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_calli.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_calli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldarg.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldarg.ilproj
index 852c0b1..6d0cbcb 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldarg.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldarg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_ldarg.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldloc.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldloc.ilproj
index 7da7712..2e87827 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldloc.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldloc.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="castclass_ldloc.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_call.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_call.ilproj
index e35872d..6a81aed 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_call.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_call.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_call.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_calli.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_calli.ilproj
index b267c08..ce5c85c 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_calli.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_calli.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_calli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldarg.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldarg.ilproj
index 754f5b9..47ce446 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldarg.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldarg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_ldarg.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldloc.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldloc.ilproj
index 705ed75..60275bb 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldloc.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldloc.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="isinst_ldloc.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relldnull.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relldnull.ilproj
index 899f128..5a1fe0f 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relldnull.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relldnull.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldnull.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj
index 873857f..e8806b2 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj
index 027bcd3..48ce50f 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_ldarg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj
index 346926d..8a2b9fa 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_ldloc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj
index 4500070..345d114 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_newobj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj
index 6eb52c5..15cbca1 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj
index f6d3e0f..42ae599 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_ldarg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj
index f26e9f9..fcd9891 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_ldloc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj
index ff11f7f..39cac57 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_newobj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj
index 0cf3b7e..8108a54 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj
index 1a6458f..77fef07 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_ldarg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj
index ecd5ebf..c1d5dc6 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_ldloc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj
index 5e3d5fb..a7efd1b 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_newobj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj
index 9ecd8c0..2cfa476 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj
index ab1b968..a2a70ba 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_ldarg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj
index 0c59dfd..f295a02 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_ldloc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj
index 4341f6e..cabe6f1 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_newobj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj
index 0cf3b7e..8108a54 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj
index 1a6458f..77fef07 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_ldarg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj
index ecd5ebf..c1d5dc6 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_ldloc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj
index 5e3d5fb..a7efd1b 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castclass_newobj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj
index 9ecd8c0..2cfa476 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_call.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj
index ab1b968..a2a70ba 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_ldarg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj
index 0c59dfd..f295a02 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_ldloc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj
index 4341f6e..cabe6f1 100644 (file)
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="isinst_newobj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj b/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj
index ca4c942..11e5cac 100644 (file)
--- a/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj
+++ b/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="iface1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/iface/_il_dbgiface2.ilproj b/tests/src/JIT/Methodical/casts/iface/_il_dbgiface2.ilproj
index 013bd90..ac596d1 100644 (file)
--- a/tests/src/JIT/Methodical/casts/iface/_il_dbgiface2.ilproj
+++ b/tests/src/JIT/Methodical/casts/iface/_il_dbgiface2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="iface2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/iface/_il_reliface2.ilproj b/tests/src/JIT/Methodical/casts/iface/_il_reliface2.ilproj
index ef750a4..76506b8 100644 (file)
--- a/tests/src/JIT/Methodical/casts/iface/_il_reliface2.ilproj
+++ b/tests/src/JIT/Methodical/casts/iface/_il_reliface2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="iface2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj b/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj
index ca4c942..11e5cac 100644 (file)
--- a/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj
+++ b/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="iface1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj b/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj
index 5ffabcc..73bc7d9 100644 (file)
--- a/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj
+++ b/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="iface1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj b/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj
index 5ffabcc..73bc7d9 100644 (file)
--- a/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj
+++ b/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="iface1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj b/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj
index 01de80f..8ecb62e 100644 (file)
--- a/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj
+++ b/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="commonBase.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/casts/ilseq/_il_reltypeEqualOp.ilproj b/tests/src/JIT/Methodical/casts/ilseq/_il_reltypeEqualOp.ilproj
index 822e5e3..2f4f18c 100644 (file)
--- a/tests/src/JIT/Methodical/casts/ilseq/_il_reltypeEqualOp.ilproj
+++ b/tests/src/JIT/Methodical/casts/ilseq/_il_reltypeEqualOp.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="typeEqualOp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj b/tests/src/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
index 22cd049..038b14f 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
+++ b/tests/src/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deadlock.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj b/tests/src/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
index fe0aa5e..f786bff 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deadlock.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj b/tests/src/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj
index 1f604c7..83a8f51 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="prefldinit3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
index 0af989c..5f6b769 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
index 6551230..512249f 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
index 0af989c..5f6b769 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
index 6551230..512249f 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
index 79c8b0d..cad5683 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise1b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
index 28c25dd..97ab3b8 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise1b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
index 79c8b0d..cad5683 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise1b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
index 28c25dd..97ab3b8 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise1b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
index 28954a3..2d8b645 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
index cd053c6..3f7a12d 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
index 28954a3..2d8b645 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
index cd053c6..3f7a12d 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
index 67302e5..4ad7093 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
index 5bdcdaa..8d6407b 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
index 67302e5..4ad7093 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
index 5bdcdaa..8d6407b 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="precise4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
index 69a85ec..0ca6e1e 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="prefldinit1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
index 26ce81b..a10091f 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="prefldinit1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
index f1bd614..6db155b 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="prefldinit2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
index 7775b29..2606d6b 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="prefldinit2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
index 4878807..e607de5 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="prefldinit4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
index d872cac..6710f3a 100644 (file)
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="prefldinit4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
index 5cfc7b1..1c9b86f 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimaldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
index e14258a..05bb9eb 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimaldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
index 5cfc7b1..1c9b86f 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimaldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
index e14258a..05bb9eb 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimaldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj
index 69fb486..d45520f 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj
index 521d77c..1284ee8 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj
index 69fb486..d45520f 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
index 521d77c..1284ee8 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj
index c14d4bc..eda50aa 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj
index e1e55b4..5c61587 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj
index c14d4bc..eda50aa 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
index e1e55b4..5c61587 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj b/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj
index 51a2044..02b6b56 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="negSignedMod.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
index 1e38569..ab2c775 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="overlddiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
index 1362c46..a1c8ca1 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="overlddiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
index 1e38569..ab2c775 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="overlddiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
index 1362c46..a1c8ca1 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="overlddiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj
index 856750f..11e5db4 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj
index 3f4f121..f9bf116 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj
index 856750f..11e5db4 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
index 3f4f121..f9bf116 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj
index aef4fef..5b835d0 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj
index 07f19f4..8574896 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj
index aef4fef..5b835d0 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
index 07f19f4..8574896 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj
index 6cac4c0..54fb22f 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj
index cbc623d..dba7e9a 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj
index 6cac4c0..54fb22f 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
index cbc623d..dba7e9a 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u4div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj
index 0829d9c..b538d7b 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj
index 140dc3d..11f756a 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj
index 0829d9c..b538d7b 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
index 140dc3d..11f756a 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u8div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
index b46e184..5c9ea65 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimalrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
index c4149a9..e7b4b8b 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimalrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
index b46e184..5c9ea65 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimalrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
index c4149a9..e7b4b8b 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="decimalrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
index 16aaf13..335ff37 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
index 27be14a..1338e8e 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
index 16aaf13..335ff37 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
index 27be14a..1338e8e 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
index 437bc84..54572c0 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
index dd39b36..23d9367 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
index 437bc84..54572c0 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
index dd39b36..23d9367 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="i8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
index de6edf0..71a12cb 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="overldrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
index dc1387a..ba7ffca 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="overldrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
index de6edf0..71a12cb 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="overldrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
index dc1387a..ba7ffca 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="overldrem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
index 319ba73..28c8b56 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
index f798d2e..d8653d6 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
index 319ba73..28c8b56 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
index f798d2e..d8653d6 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
index fe800af..fce331e 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
index aae4eb2..551a42e 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
index fe800af..fce331e 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
index aae4eb2..551a42e 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="r8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
index eb83413..df8eda1 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
index d67c230..4d3c556 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
index eb83413..df8eda1 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
index d67c230..4d3c556 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u4rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
index f3282c6..b1f39aa 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
index f3db658..cd3492e 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
index f3282c6..b1f39aa 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
index f3db658..cd3492e 100644 (file)
--- a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="u8rem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/eh/interactions/ehso.csproj b/tests/src/JIT/Methodical/eh/interactions/ehso.csproj
index 0eacfc0..9f5aa8f 100644 (file)
--- a/tests/src/JIT/Methodical/eh/interactions/ehso.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/ehso.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="ehSO.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj b/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
index 68a631a..dbd0615 100644 (file)
--- a/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="volatileFromFinally.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_c.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_c.ilproj
index f1ca0ba..14ea3f0 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_c.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_c.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f4.ilproj
index 13d13b1..9d03d2d 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_f4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f8.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f8.ilproj
index c8236f2..e84c06a 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f8.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_f8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i1.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i1.ilproj
index c0ab180..f95f48e 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i1.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_i1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i2.ilproj
index bee6750..5e4d7c2 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_i2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i4.ilproj
index 9340cf7..e588f90 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_o.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_o.ilproj
index 4c56e62..79326c3 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_o.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_o.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_o.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_s.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_s.ilproj
index b98048a..8ca0d08 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_s.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_s.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_s.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_c.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_c.ilproj
index 3be4307..f367648 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_c.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_c.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i1.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i1.ilproj
index 913f9b9..05af04d 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i1.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_i1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i2.ilproj
index 0d8e431..af6dcd4 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_i2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i4.ilproj
index 64f2c30..92ee07d 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o.ilproj
index 2d931ab..1823e1c 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_o.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o2.ilproj
index bde93fe..fa2571e 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_o2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r4.ilproj
index 127978f..58de552 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_r4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r8.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r8.ilproj
index 1575dea..539d49c 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r8.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_r8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_u2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_u2.ilproj
index 1a8bd05..37564de 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_u2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_c.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_c.ilproj
index 9b2cfa6..d5addfc 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_c.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_c.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f4.ilproj
index 66c8031..3cef84f 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_f4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f8.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f8.ilproj
index 9dda51b..db95cb2 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f8.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_f8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i1.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i1.ilproj
index 8658643..37cbf03 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i1.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_i1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i2.ilproj
index a7c2d6d..7f0e86d 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_i2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i4.ilproj
index ffe59b8..a144355 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_o.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_o.ilproj
index e020de9..86a09de 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_o.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_o.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_o.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_s.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_s.ilproj
index e9a0985..97c4453 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_s.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_s.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_s.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_c.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_c.ilproj
index f0b5bdc..40a67c9 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_c.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_c.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i1.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i1.ilproj
index c0202ab..afd0366 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i1.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_i1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i2.ilproj
index 95b742f..58d583b 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_i2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i4.ilproj
index 11a8de5..2830100 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o.ilproj
index 380c18b..393e3da 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_o.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o2.ilproj
index a5d1734..cd7674e 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_o2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r4.ilproj
index 4f528b8..45578fd 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_r4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r8.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r8.ilproj
index 8243255..5f07d67 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r8.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_r8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_u2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_u2.ilproj
index f65ae3b..c51cf55 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_u2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refloc_u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/basic/refarg_c.csproj b/tests/src/JIT/Methodical/explicit/basic/refarg_c.csproj
index 691509b..dc4c4e4 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/refarg_c.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/refarg_c.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="refarg_c.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/basic/refarg_f4.csproj b/tests/src/JIT/Methodical/explicit/basic/refarg_f4.csproj
index 4d20633..e93b003 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/refarg_f4.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/refarg_f4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="refarg_f4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/basic/refarg_f8.csproj b/tests/src/JIT/Methodical/explicit/basic/refarg_f8.csproj
index 9532bb0..b5d22ec 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/refarg_f8.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/refarg_f8.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="refarg_f8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/basic/refarg_i1.csproj b/tests/src/JIT/Methodical/explicit/basic/refarg_i1.csproj
index 241b4a0..6d4ead0 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/refarg_i1.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/refarg_i1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="refarg_i1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/basic/refarg_i2.csproj b/tests/src/JIT/Methodical/explicit/basic/refarg_i2.csproj
index 77168b9..0040e60 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/refarg_i2.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/refarg_i2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="refarg_i2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/basic/refarg_i4.csproj b/tests/src/JIT/Methodical/explicit/basic/refarg_i4.csproj
index d186af3..79bb6e0 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/refarg_i4.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/refarg_i4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="refarg_i4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/basic/refarg_o.csproj b/tests/src/JIT/Methodical/explicit/basic/refarg_o.csproj
index d4261cd..5f5cc5b 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/refarg_o.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/refarg_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="refarg_o.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/basic/refarg_s.csproj b/tests/src/JIT/Methodical/explicit/basic/refarg_s.csproj
index bd3c375..03dbeba 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/basic/refarg_s.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/refarg_s.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="refarg_s.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj
index 0942f7f..fe85b34 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="expl_funcptr_gc.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj
index 84c9604..202fe79 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="expl_funcptr_gc.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj
index 2f7838b..44693c3 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="expl_funcptr_val.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj
index 2de90cb..f5f8f14 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="expl_funcptr_val.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj
index 4b18b44..73c40c8 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="seq_funcptr_gc.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj
index 66949a4..b102b6e 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="seq_funcptr_gc.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj
index 0a46391..c6350d1 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="seq_funcptr_val.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj
index c273083..c663e5e 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="seq_funcptr_val.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj
index c37e4ac..b753ec0 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj
index dae867e..ec0861c 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj
index 8aad88b..617683f 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj
index ac72954..b6e41c6 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj
index 6a7c8f9..8642904 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj
index f8d41ec..1551a53 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit6.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj
index d314016..c387f1b 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit7.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj
index c83aaa0..1ee9653 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_val.ilproj b/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_val.ilproj
index 6edbce8..34fdd67 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_val.ilproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_val.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_box_val.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_val.ilproj b/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_val.ilproj
index 1255a65..1b603de 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_val.ilproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_val.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refarg_box_val.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj
index 3a1e15b..e47f8b9 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj
index c04d110..af5eba9 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj
index 1f698a3..211d92a 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj
index c078c57..bc36de6 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj
index 3d3757b..fa35eb2 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj
index 482f20a..d59e44a 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit6.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj
index c931d92..09450c8 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit7.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj
index 6cb8d09..d04abd8 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj
index 3a1e15b..e47f8b9 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj
index c04d110..af5eba9 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj
index 1f698a3..211d92a 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj
index c078c57..bc36de6 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj
index 3d3757b..fa35eb2 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj
index 482f20a..d59e44a 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit6.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj
index c931d92..09450c8 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit7.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj
index 6cb8d09..d04abd8 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj
index c37e4ac..b753ec0 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj
index dae867e..ec0861c 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj
index 8aad88b..617683f 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj
index ac72954..b6e41c6 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj
index 6a7c8f9..8642904 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj
index f8d41ec..1551a53 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit6.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj
index d314016..c387f1b 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit7.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj
index c83aaa0..1ee9653 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="explicit8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_double.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_double.ilproj
index e1c9a8b..4ed3131 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_double.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_double.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotarg_double.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_float.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_float.ilproj
index a8647f1..f327ae4 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_float.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_float.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotarg_float.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_objref.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_objref.ilproj
index 6d490d6..b717686 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_objref.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_objref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotarg_objref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_valref.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_valref.ilproj
index 4fe9785..ab576da 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_valref.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_valref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotarg_valref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_i4.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_i4.ilproj
index c1f19b6..300d812 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotate_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_u2.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_u2.ilproj
index 1850382..b177f0a 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_u2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotate_u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_double.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_double.ilproj
index 7a46dde..f13ea23 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_double.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_double.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotarg_double.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_float.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_float.ilproj
index fffb365..f39613f 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_float.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_float.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotarg_float.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_objref.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_objref.ilproj
index db0462f..fb9e8a7 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_objref.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_objref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotarg_objref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_valref.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_valref.ilproj
index 99f2647..9d1b81d 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_valref.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_valref.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotarg_valref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_i4.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_i4.ilproj
index 7730950..3d02981 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_i4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotate_i4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_u2.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_u2.ilproj
index 6aa8dc7..a4c4d9e 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_u2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rotate_u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/explicit/rotate/rotarg_double.csproj b/tests/src/JIT/Methodical/explicit/rotate/rotarg_double.csproj
index eecd575..6cce180 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/rotarg_double.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/rotarg_double.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="rotarg_double.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/rotate/rotarg_float.csproj b/tests/src/JIT/Methodical/explicit/rotate/rotarg_float.csproj
index ddacd6e..473f3d8 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/rotarg_float.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/rotarg_float.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="rotarg_float.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/rotate/rotarg_objref.csproj b/tests/src/JIT/Methodical/explicit/rotate/rotarg_objref.csproj
index 53874bb..5fd11ed 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/rotarg_objref.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/rotarg_objref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="rotarg_objref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/explicit/rotate/rotarg_valref.csproj b/tests/src/JIT/Methodical/explicit/rotate/rotarg_valref.csproj
index 40afbb1..00088f2 100644 (file)
--- a/tests/src/JIT/Methodical/explicit/rotate/rotarg_valref.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/rotarg_valref.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="rotarg_valref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj b/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
index 4d422f2..be1afee 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="intToByte.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj b/tests/src/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj
index b9f669e..56a3f09 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ILStackAllocRepro.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj b/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
index 7f06042..961a86c 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ehCodeMotion.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj b/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
index 3e69afc..12a2811 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="finallyclone.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
index 5579032..156cc00 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="twoEndFinallys.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.ilproj b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.ilproj
index ccb3b02..41cb6cc 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="twoEndFinallys.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj b/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
index f300447..dda04b7 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ptuple_lost.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj b/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
index 1acbfdf..02bc00c 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ssa_tuIsAddr.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj
index d88c249..0ed5f47 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="GCMaskForGSCookie.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
index d05339a..d0b10c7 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arrayDim.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
index d83eb29..5f9b516 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="osrAddovershot.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
index 72cc741..33b44a6 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="GCOverReporting.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
index 9164fda..776df45 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="castClassEH.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
index 6cc7bc2..4ef9bfd 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="sealedCastVariance.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
index f9ab61c..0e5d4d0 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="singleRefField.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
index 3c08f25..b26696c 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="zeroInitStackSlot.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj
index 66c9a63..def721a 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cpblkInt32.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj
index 34c41dc..0a4014b 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="flowgraph.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj
index 9b3ae91..07d51fe 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="indexMinusOne.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj
index 60cce38..d1a3e44 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="volatileLocal1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj
index 6e6d801..0b31629 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="volatileLocal2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
index 985035f..dad50a8 100644 (file)
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="qMarkColon.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/inlining/bug505642/test.csproj b/tests/src/JIT/Methodical/inlining/bug505642/test.csproj
index 820a7dd..ca2d4f2 100644 (file)
--- a/tests/src/JIT/Methodical/inlining/bug505642/test.csproj
+++ b/tests/src/JIT/Methodical/inlining/bug505642/test.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj
index 51d27d8..f31cc34 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_long.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj
index 3c591e6..f2849f2 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_ulong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.ilproj
index 58875df..300b948 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="hugedim.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj
index f91d1bf..cd8dfbd 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lcs_long.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj
index 01c8157..3207dca 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lcs_ulong.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj
index 4139118..5bc038c 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="hugedim.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj
index 497ad6d..fa5d285 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lcs_long.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj
index ff576ec..274dced 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lcs_ulong.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj
index 51d27d8..f31cc34 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_long.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj
index 3c591e6..f2849f2 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_ulong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj
index 7ad9593..90e98bb 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_long.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj
index 9601e97..9b33d50 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_ulong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj
index 7ad9593..90e98bb 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_long.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj
index 9601e97..9b33d50 100644 (file)
--- a/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="lcs_ulong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj
index bbaef96..f21753b 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="binop.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj b/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj
index d5534e8..255a732 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="box.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.ilproj
index 0f35e5b..42668f0 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.ilproj
+++ b/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="binop.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj
index 79eae63..8f1dc9c 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj
+++ b/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="box.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj
index cf52104..22b0ddc 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj
+++ b/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="binop.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj
index 97888b3..fcdc6cb 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj
+++ b/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="box.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj
index bbaef96..f21753b 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="binop.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/misc/_relbox.csproj b/tests/src/JIT/Methodical/int64/misc/_relbox.csproj
index d5534e8..255a732 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_relbox.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_relbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="box.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj
index 9c423c8..bd7d367 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="binop.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj
index f8e2577..b87d1ec 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="box.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj
index 9c423c8..bd7d367 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="binop.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj
index f8e2577..b87d1ec 100644 (file)
--- a/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="box.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj
index b8e5f4a..2f99ba6 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_addsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj
index 0f9da9c..3098dd0 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj
index 9d7adf9..bcdd4a8 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj
index 0eadcc8..cc39e32 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj
index b712ddf..6118070 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj
index 73e9294..7826a33 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj
index d102a94..780c5cf 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldsfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj
index f3d4d39..7951d6b 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldsfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj
index 89eb1d8..5feeb83 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_muldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.ilproj
index 3947bbb..8a83147 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_addsub.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj
index 659c904..fad09e7 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldc_div.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj
index b235485..0a9c5b7 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldc_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj
index 6766003..fc8f70f 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldc_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj
index ed69ce5..c1f7f47 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldfld_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj
index 852e0c0..e3c0734 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldfld_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj
index deb2ece..e45b1f8 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldsfld_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj
index 4260358..a6c6096 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldsfld_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj
index 1ba2be5..4ab57d5 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_muldiv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj
index 00ef4df..a58326f 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_addsub.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj
index cb2efc8..8e1a0c5 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldc_div.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj
index 62f8ab0..37ba094 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldc_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj
index 4ccead8..81cf0c0 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldc_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj
index 7643730..1dcc785 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldfld_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj
index 544b12b..a380dff 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldfld_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj
index 2e46121..bfceb89 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldsfld_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj
index 34aa66b..1675c9c 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_ldsfld_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj
index cf9d020..c3abf80 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="s_muldiv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj
index b8e5f4a..2f99ba6 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_addsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj
index 0f9da9c..3098dd0 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj
index 9d7adf9..bcdd4a8 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj
index 0eadcc8..cc39e32 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj
index b712ddf..6118070 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj
index 73e9294..7826a33 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj
index d102a94..780c5cf 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldsfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj
index f3d4d39..7951d6b 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldsfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj
index 89eb1d8..5feeb83 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_muldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj
index 2ca4c59..71ae4fb 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_addsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj
index 9015e6c..8d28037 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj
index 28cc460..1856115 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj
index 670c6c4..9c52971 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj
index 41c9c32..ba80280 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj
index c0d4645..e15d8b5 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj
index 7c963dd..c753bc4 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldsfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj
index 54e9a1f..8c6d02b 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldsfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj
index ebe2dcc..8ba6493 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_muldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj
index 2ca4c59..71ae4fb 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_addsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj
index 9015e6c..8d28037 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_div.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj
index 28cc460..1856115 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj
index 670c6c4..9c52971 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldc_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj
index 41c9c32..ba80280 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj
index c0d4645..e15d8b5 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj
index 7c963dd..c753bc4 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldsfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj
index 54e9a1f..8c6d02b 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_ldsfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj
index ebe2dcc..8ba6493 100644 (file)
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="s_muldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj
index eb255e9..17db469 100644 (file)
--- a/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="superlong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.ilproj b/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.ilproj
index 35e7d1c..1cb1deb 100644 (file)
--- a/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.ilproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="superlong.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj b/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj
index c6a4855..a29b3f9 100644 (file)
--- a/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="superlong.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj
index eb255e9..17db469 100644 (file)
--- a/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="superlong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj
index 252dd33..6411c81 100644 (file)
--- a/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="superlong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj
index 252dd33..6411c81 100644 (file)
--- a/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="superlong.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj
index ba2e7ae..b62bca3 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="addsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj
index 798c113..dc3a7c8 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldc_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj
index 71fff19..fef69bb 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldc_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj
index 91000b9..0d3e660 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj
index ba1c682..ab79b61 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj
index 026b434..4a31ea4 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldsfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj
index e1719dd..0258fd6 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldsfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj
index 3b938e0..45e0e65 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="muldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.ilproj
index 714880b..144a968 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="addsub.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj
index 87dbd03..7eb2689 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj
index 556fee7..c005392 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj
index 0f7193a..87cf919 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldfld_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj
index b87f7cb..67c1984 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldfld_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj
index 18fa6c2..f330074 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldsfld_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj
index ef44149..9ae0478 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldsfld_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj
index 61107e1..add7d1e 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="muldiv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj
index 3e0bf7d..4161ffa 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="addsub.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj
index 0a4f0d9..0221370 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj
index f27ee29..27a2c9b 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldc_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj
index e066202..68380cc 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldfld_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj
index a3c6f64..9c67c21 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldfld_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj
index 1c35422..5a00e5d 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldsfld_mul.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj
index 9729f16..65ad7fd 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldsfld_mulovf.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj
index 37b1dc2..a1fa68e 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="muldiv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj
index ba2e7ae..b62bca3 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="addsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj
index 798c113..dc3a7c8 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldc_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj
index 71fff19..fef69bb 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldc_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj
index 91000b9..0d3e660 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj
index ba1c682..ab79b61 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj
index 026b434..4a31ea4 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldsfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj
index e1719dd..0258fd6 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldsfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj
index 3b938e0..45e0e65 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="muldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj
index 686d56b..f1b4a93 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="addsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj
index 15a98dd..04571eb 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldc_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj
index 6860753..04aa936 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldc_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj
index 1923078..c17cf71 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj
index 394dc33..14af800 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj
index dd6d9c6..61a20d0 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldsfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj
index ef2291d..38bfff0 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldsfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj
index 025e760..31e2321 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="muldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj
index 686d56b..f1b4a93 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="addsub.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj
index 15a98dd..04571eb 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldc_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj
index 6860753..04aa936 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldc_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj
index 1923078..c17cf71 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj
index 394dc33..14af800 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj
index dd6d9c6..61a20d0 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldsfld_mul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj
index ef2291d..38bfff0 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ldsfld_mulovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj
index 025e760..31e2321 100644 (file)
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="muldiv.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/ldtoken/_il_dbgldtoken.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_dbgldtoken.ilproj
index 66dcbb9..62fbc4d 100644 (file)
--- a/tests/src/JIT/Methodical/ldtoken/_il_dbgldtoken.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_dbgldtoken.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldtoken.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ldtoken/_il_dbgldtokena.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_dbgldtokena.ilproj
index 8fc2d0d..a608376 100644 (file)
--- a/tests/src/JIT/Methodical/ldtoken/_il_dbgldtokena.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_dbgldtokena.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldtokena.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ldtoken/_il_dbgptr_types.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_dbgptr_types.ilproj
index 4498d66..57fd05d 100644 (file)
--- a/tests/src/JIT/Methodical/ldtoken/_il_dbgptr_types.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_dbgptr_types.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ptr_types.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ldtoken/_il_relldtoken.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_relldtoken.ilproj
index a6d301c..dd13ef9 100644 (file)
--- a/tests/src/JIT/Methodical/ldtoken/_il_relldtoken.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_relldtoken.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldtoken.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ldtoken/_il_relldtokena.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_relldtokena.ilproj
index 1cea779..3706eac 100644 (file)
--- a/tests/src/JIT/Methodical/ldtoken/_il_relldtokena.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_relldtokena.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldtokena.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/ldtoken/_il_relptr_types.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_relptr_types.ilproj
index e0c2f82..42b95c3 100644 (file)
--- a/tests/src/JIT/Methodical/ldtoken/_il_relptr_types.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_relptr_types.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ptr_types.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj b/tests/src/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj
index 63cfe88..05b5b3b 100644 (file)
--- a/tests/src/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj
+++ b/tests/src/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="verify01_dynamic.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/localloc/verify/verify01_large.ilproj b/tests/src/JIT/Methodical/localloc/verify/verify01_large.ilproj
index 45d8ae0..650f47b 100644 (file)
--- a/tests/src/JIT/Methodical/localloc/verify/verify01_large.ilproj
+++ b/tests/src/JIT/Methodical/localloc/verify/verify01_large.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="verify01_large.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/localloc/verify/verify01_small.ilproj b/tests/src/JIT/Methodical/localloc/verify/verify01_small.ilproj
index 1a222cc..c73a477 100644 (file)
--- a/tests/src/JIT/Methodical/localloc/verify/verify01_small.ilproj
+++ b/tests/src/JIT/Methodical/localloc/verify/verify01_small.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="verify01_small.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj b/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj
index 8c1fd36..ccf97b4 100644 (file)
--- a/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj
+++ b/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="zeroInit01_large.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj b/tests/src/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj
index 219b570..070cf70 100644 (file)
--- a/tests/src/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj
+++ b/tests/src/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="zeroinit01_small.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj b/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj
index 9b5be21..8bbfa05 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="classic.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj b/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj
index db4c3e3..435d0aa 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="delegate.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj b/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj
index a7f53b4..f0db1be 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="generics.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj b/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj
index d70ad02..9d9a144 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="generics2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.ilproj
index 0400f7c..e7dab02 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="generics2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj
index c4c2818..7eebf24 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="generics2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj b/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj
index ece15e6..4ce54af 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="tailcall.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj
index 5fa46e8..93082ee 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="tailcall.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj
index aae57d0..3d82056 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="tailcall.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj b/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj
index 32d53f5..00072f1 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="valuetype.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj
index 54b5089..513f81e 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="valuetype.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj
index 98cd2ad..92c94a5 100644 (file)
--- a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="valuetype.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_dbgarray1.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgarray1.ilproj
index 9b19a12..297979d 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_dbgarray1.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgarray1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_dbgarray2.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgarray2.ilproj
index fc408d4..6efde20 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_dbgarray2.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgarray2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_dbgarray3.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgarray3.ilproj
index c86ec4f..bc4b08c 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_dbgarray3.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgarray3.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_dbgnative.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgnative.ilproj
index e3c3d0f..e33f05e 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_dbgnative.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgnative.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="native.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_dbgseq.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgseq.ilproj
index f3ca46d..005655b 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_dbgseq.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgseq.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="seq.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_dbgstress2.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgstress2.ilproj
index c17bfd0..7a1f70f 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_dbgstress2.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgstress2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="stress2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_dbgu_native.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgu_native.ilproj
index 6b7201d..db9d316 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_dbgu_native.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgu_native.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_native.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_relarray1.ilproj b/tests/src/JIT/Methodical/refany/_il_relarray1.ilproj
index b59cf95..af25cf2 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_relarray1.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relarray1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_relarray2.ilproj b/tests/src/JIT/Methodical/refany/_il_relarray2.ilproj
index 80f09f6..e1bc35f 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_relarray2.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relarray2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_relarray3.ilproj b/tests/src/JIT/Methodical/refany/_il_relarray3.ilproj
index e40c1c7..30b97b2 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_relarray3.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relarray3.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_relnative.ilproj b/tests/src/JIT/Methodical/refany/_il_relnative.ilproj
index 3cb67ef..775f170 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_relnative.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relnative.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="native.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_relseq.ilproj b/tests/src/JIT/Methodical/refany/_il_relseq.ilproj
index d2a1664..0503d9f 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_relseq.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relseq.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="seq.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_relstress2.ilproj b/tests/src/JIT/Methodical/refany/_il_relstress2.ilproj
index dc6acdb..9fca21f 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_relstress2.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relstress2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="stress2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/_il_relu_native.ilproj b/tests/src/JIT/Methodical/refany/_il_relu_native.ilproj
index 3f9d1a7..d4f487d 100644 (file)
--- a/tests/src/JIT/Methodical/refany/_il_relu_native.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relu_native.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="u_native.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/refany/array1.csproj b/tests/src/JIT/Methodical/refany/array1.csproj
index 5910596..79d7394 100644 (file)
--- a/tests/src/JIT/Methodical/refany/array1.csproj
+++ b/tests/src/JIT/Methodical/refany/array1.csproj
@@ -13,9 +13,8 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,14 +34,15 @@
     <Compile Include="array1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)empty.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)empty.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/refany/array2.csproj b/tests/src/JIT/Methodical/refany/array2.csproj
index 238605f..26861df 100644 (file)
--- a/tests/src/JIT/Methodical/refany/array2.csproj
+++ b/tests/src/JIT/Methodical/refany/array2.csproj
@@ -13,9 +13,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,14 +35,15 @@
     <Compile Include="array2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)empty.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)empty.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/refany/format.csproj b/tests/src/JIT/Methodical/refany/format.csproj
index 6cad843..65e14b1 100644 (file)
--- a/tests/src/JIT/Methodical/refany/format.csproj
+++ b/tests/src/JIT/Methodical/refany/format.csproj
@@ -13,9 +13,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,14 +35,15 @@
     <Compile Include="format.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)empty.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)empty.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/refany/gcreport.csproj b/tests/src/JIT/Methodical/refany/gcreport.csproj
index db7630e..418912e 100644 (file)
--- a/tests/src/JIT/Methodical/refany/gcreport.csproj
+++ b/tests/src/JIT/Methodical/refany/gcreport.csproj
@@ -13,9 +13,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,14 +35,15 @@
     <Compile Include="gcreport.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)empty.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)empty.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/refany/lcs.csproj b/tests/src/JIT/Methodical/refany/lcs.csproj
index 0ffbd00..28dd6e4 100644 (file)
--- a/tests/src/JIT/Methodical/refany/lcs.csproj
+++ b/tests/src/JIT/Methodical/refany/lcs.csproj
@@ -13,9 +13,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,14 +35,15 @@
     <Compile Include="lcs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)empty.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)empty.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/refany/native.csproj b/tests/src/JIT/Methodical/refany/native.csproj
index 66fa9a7..e4c4b3b 100644 (file)
--- a/tests/src/JIT/Methodical/refany/native.csproj
+++ b/tests/src/JIT/Methodical/refany/native.csproj
@@ -13,9 +13,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,14 +35,15 @@
     <Compile Include="native.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)empty.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)empty.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/refany/virtcall.csproj b/tests/src/JIT/Methodical/refany/virtcall.csproj
index 32dbc6f..a1223e4 100644 (file)
--- a/tests/src/JIT/Methodical/refany/virtcall.csproj
+++ b/tests/src/JIT/Methodical/refany/virtcall.csproj
@@ -13,9 +13,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,14 +35,15 @@
     <Compile Include="virtcall.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)empty.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)empty\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)empty.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_enum.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_enum.ilproj
index 079ab5f..5720e10 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_enum.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_enum.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_enum.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i2_bool.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i2_bool.ilproj
index 57a8bb2..d24c362 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i2_bool.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i2_bool.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_i2_bool.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_i1.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_i1.ilproj
index d7560fb..745f5af 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_i1.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_i1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_i4_i1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_u.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_u.ilproj
index 22e8b61..16cac84 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_u.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_u.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_i4_u.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i_u2.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i_u2.ilproj
index cb6272a..6cc9220 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i_u2.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i_u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_i_u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_obj.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_obj.ilproj
index ab1bcdc..1e80f03 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_obj.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_obj.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_obj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_v.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_v.ilproj
index 11f5512..5398e9c 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_v.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_v.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_v.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array.ilproj
index 39ac887..970f597 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_array.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array_nz.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array_nz.ilproj
index 6be27bd..a210ca0 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array_nz.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array_nz.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_array_nz.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_gc.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_gc.ilproj
index fad776e..f4d92eb 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_gc.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_gc.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_gc.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_inst.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_inst.ilproj
index fa60937..9977fb3 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_inst.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_inst.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_inst.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_value.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_value.ilproj
index d6eb6ce..747f28c 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_value.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_value.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_value.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_virt.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_virt.ilproj
index 179d624..8d1adcf 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_virt.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_virt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_virt.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbggcval.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbggcval.ilproj
index 7c88738..ae1184c 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbggcval.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbggcval.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="gcval.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbggcval_nested.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbggcval_nested.ilproj
index a82765f..a178b95 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbggcval_nested.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbggcval_nested.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="gcval_nested.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbggcval_sideeffect.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbggcval_sideeffect.ilproj
index 0591c04..c4e0a90 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbggcval_sideeffect.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbggcval_sideeffect.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="gcval_sideeffect.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep.ilproj
index 666c5fd..f3b67a0 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_ep.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgreference_i.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgreference_i.ilproj
index af9a81d..033ac44 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgreference_i.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgreference_i.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="reference_i.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2a.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2a.ilproj
index 913194c..24ecc59 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2a.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_2a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2b.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2b.ilproj
index a5eb2f5..8156523 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2b.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_2b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2c.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2c.ilproj
index 2299a2c..c2b7e20 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2c.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2c.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_2c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_3b.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_3b.ilproj
index 255009f..2ee3648 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_3b.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_3b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_3b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_mutual_rec.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_mutual_rec.ilproj
index 38a3c9d..55a1b34 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_mutual_rec.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_mutual_rec.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_mutual_rec.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_switch.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_switch.ilproj
index 298ecce..b330bfe 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_switch.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_switch.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_switch.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_virt.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_virt.ilproj
index 1714ab7..166bacb 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_virt.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_virt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_virt.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_enum.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_enum.ilproj
index 5b9e991..82d7ef9 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_enum.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_enum.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_enum.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i2_bool.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i2_bool.ilproj
index a000ed6..7a7383a 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i2_bool.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i2_bool.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_i2_bool.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_i1.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_i1.ilproj
index 631b248..5cddde1 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_i1.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_i1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_i4_i1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_u.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_u.ilproj
index 019066c..e800bcd 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_u.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_u.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_i4_u.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i_u2.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i_u2.ilproj
index 68ad603..cd31742 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i_u2.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i_u2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_i_u2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_obj.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_obj.ilproj
index f11c3eb..6984fe1 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_obj.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_obj.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_obj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_v.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_v.ilproj
index f23de9a..804deba 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_v.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_v.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="compat_v.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_array.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_array.ilproj
index e9b3156..266334e 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_array.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_array.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_array.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_array_nz.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_array_nz.ilproj
index f335c55..1b154d1 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_array_nz.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_array_nz.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_array_nz.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_gc.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_gc.ilproj
index 0ccdaac..bb01b4a 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_gc.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_gc.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_gc.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_inst.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_inst.ilproj
index 8035736..17924a9 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_inst.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_inst.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_inst.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_value.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_value.ilproj
index 2c24d18..edb3fee 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_value.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_value.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_value.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_virt.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_virt.ilproj
index 6dae023..d42ec0f 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_virt.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_virt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="deep_virt.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relgcval.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relgcval.ilproj
index f55d1fa..1f1817d 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relgcval.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relgcval.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="gcval.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relgcval_nested.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relgcval_nested.ilproj
index c63e2a6..33add8a 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relgcval_nested.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relgcval_nested.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="gcval_nested.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relgcval_sideeffect.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relgcval_sideeffect.ilproj
index ff1c581..35c566e 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relgcval_sideeffect.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relgcval_sideeffect.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="gcval_sideeffect.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep.ilproj
index a6cddcc..dfe9e6a 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="recurse_ep.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_relreference_i.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relreference_i.ilproj
index de4ca3c..395df9c 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_relreference_i.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relreference_i.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="reference_i.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_2a.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_2a.ilproj
index 9ef30cf..b5597ab 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_2a.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_2a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_2a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_2b.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_2b.ilproj
index 1fd2a83..f22fcdf 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_2b.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_2b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_2b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_2c.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_2c.ilproj
index bb96b70..b5ec2fe 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_2c.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_2c.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_2c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_3b.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_3b.ilproj
index 6795917..eb84ad1 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_3b.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_3b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_3b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_mutual_rec.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_mutual_rec.ilproj
index 280a7b9..7a11a04 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_mutual_rec.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_mutual_rec.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_mutual_rec.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_switch.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_switch.ilproj
index f48d424..f968c99 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_switch.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_switch.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_switch.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_virt.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_virt.ilproj
index b8dbff6..4730461 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_virt.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_virt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_virt.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj b/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
index 2d76439..f248696 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
+++ b/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="delegateParamCallTarget.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/tailcall_v4/smallFrame.ilproj b/tests/src/JIT/Methodical/tailcall_v4/smallFrame.ilproj
index 2be46bd..8e2391d 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall_v4/smallFrame.ilproj
+++ b/tests/src/JIT/Methodical/tailcall_v4/smallFrame.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="smallFrame.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/tailcall_v4/tailcall_AV.ilproj b/tests/src/JIT/Methodical/tailcall_v4/tailcall_AV.ilproj
index 529617f..9acef12 100644 (file)
--- a/tests/src/JIT/Methodical/tailcall_v4/tailcall_AV.ilproj
+++ b/tests/src/JIT/Methodical/tailcall_v4/tailcall_AV.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="tailcall_AV.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/varargs/callconv/gc_ctor_il_d.ilproj b/tests/src/JIT/Methodical/varargs/callconv/gc_ctor_il_d.ilproj
index 392c47a..2083a66 100644 (file)
--- a/tests/src/JIT/Methodical/varargs/callconv/gc_ctor_il_d.ilproj
+++ b/tests/src/JIT/Methodical/varargs/callconv/gc_ctor_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="gc_ctor.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/varargs/callconv/gc_ctor_il_r.ilproj b/tests/src/JIT/Methodical/varargs/callconv/gc_ctor_il_r.ilproj
index 564561f..144a352 100644 (file)
--- a/tests/src/JIT/Methodical/varargs/callconv/gc_ctor_il_r.ilproj
+++ b/tests/src/JIT/Methodical/varargs/callconv/gc_ctor_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="gc_ctor.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/varargs/callconv/val_ctor_il_d.ilproj b/tests/src/JIT/Methodical/varargs/callconv/val_ctor_il_d.ilproj
index 909d806..e1526e4 100644 (file)
--- a/tests/src/JIT/Methodical/varargs/callconv/val_ctor_il_d.ilproj
+++ b/tests/src/JIT/Methodical/varargs/callconv/val_ctor_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="val_ctor.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/varargs/callconv/val_ctor_il_r.ilproj b/tests/src/JIT/Methodical/varargs/callconv/val_ctor_il_r.ilproj
index a9ececb..692aabe 100644 (file)
--- a/tests/src/JIT/Methodical/varargs/callconv/val_ctor_il_r.ilproj
+++ b/tests/src/JIT/Methodical/varargs/callconv/val_ctor_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="val_ctor.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/varargs/misc/Dev10_615402.ilproj b/tests/src/JIT/Methodical/varargs/misc/Dev10_615402.ilproj
index 09d401e..3192b36 100644 (file)
--- a/tests/src/JIT/Methodical/varargs/misc/Dev10_615402.ilproj
+++ b/tests/src/JIT/Methodical/varargs/misc/Dev10_615402.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="Dev10_615402.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxblk/cpblk3_il_d.ilproj b/tests/src/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
index 2822046..311e1ec 100644 (file)
--- a/tests/src/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
+++ b/tests/src/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cpblk3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxblk/cpblk3_il_r.ilproj b/tests/src/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
index b8f809f..aeb2385 100644 (file)
--- a/tests/src/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
+++ b/tests/src/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cpblk3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxblk/initblk3_il_d.ilproj b/tests/src/JIT/Methodical/xxblk/initblk3_il_d.ilproj
index 360c651..d92e136 100644 (file)
--- a/tests/src/JIT/Methodical/xxblk/initblk3_il_d.ilproj
+++ b/tests/src/JIT/Methodical/xxblk/initblk3_il_d.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initblk3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxblk/initblk3_il_r.ilproj b/tests/src/JIT/Methodical/xxblk/initblk3_il_r.ilproj
index 7c9ee62..d19d2ce 100644 (file)
--- a/tests/src/JIT/Methodical/xxblk/initblk3_il_r.ilproj
+++ b/tests/src/JIT/Methodical/xxblk/initblk3_il_r.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="initblk3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I.ilproj
index 8a73351..dcde05e 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_I.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I8.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I8.ilproj
index c10b834..0749541 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I8.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_I8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R4.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R4.ilproj
index 8532a6f..2ffd059 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R4.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_R4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R8.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R8.ilproj
index b601dbb..2d24f5e 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R8.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_R8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_U2.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_U2.ilproj
index f944b06..d7ce407 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_U2.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_U2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_U2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_V.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_V.ilproj
index 00891a9..3990444 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_V.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_V.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_V.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I.ilproj
index feb55b0..0146cf1 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_I.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I8.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I8.ilproj
index 95883bc..874e823 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I8.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_I8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R4.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R4.ilproj
index ab931fe..ff28154 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R4.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R4.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_R4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R8.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R8.ilproj
index ce1d1ca..956b491 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R8.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R8.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_R8.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_U2.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_U2.ilproj
index 61eefac..f028385 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_U2.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_U2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_U2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_V.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_V.ilproj
index 7a9bf0f..76197bf 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_V.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_V.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldobj_V.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
index 13c6675..127c9d4 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="unbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj
index 0bc5ca0..d787fb5 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="const.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj
index 791751a..f1249a6 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldelema.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj
index 1bb2be1..b46116c 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="mdarray.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj
index c944a3c..8291169 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refanyval.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj
index 81883e4..f150dcd 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="unbox.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj
index 37e71d5..86c8816 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="const.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj
index dd5e96b..58e645b 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldelema.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj
index b4d8971..b43d742 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="mdarray.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj
index 98b9ebd..ea1c7e5 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="refanyval.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj
index b72339e..a5cfd3b 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="unbox.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
index 13c6675..127c9d4 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="unbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
index 1ed6e8f..26733e5 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="unbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
index 1ed6e8f..26733e5 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="unbox.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
index 93943d0..c249eb8 100644 (file)
--- a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
@@ -14,7 +14,7 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <ResolveNuGetPackages>false</ResolveNuGetPackages>
-    <LinkLocalMscorlib>true</LinkLocalMscorlib>
+    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,14 +34,15 @@
     <Compile Include="refanyval.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj
index 2eff7db..6a4d786 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b12008.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj
index 214ca00..d3eaf31 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16935.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj
index b26fb9a..ddbde8c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b40089.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj
index 1f1dc30..230642b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b40138.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj
index 669d151..7619c37 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44018.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj
index 81325a0..622939b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b45046.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
index 47b652b..be2de56 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b45679.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj
index 97aacd1..a07a9cb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b26323.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj
index 7cddf6e..52b5ab3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35455.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
index 79eeaf5..9259b13 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b46847.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj
index 8d2686e..8e0ec0d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b06440a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj
index 1cb7203..0c30b68 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b06440b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj
index ef9b54a..b54ad84 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b06440c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj
index a9f2fcb..ce0b3e9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b07341.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b09495/b09495.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b09495/b09495.ilproj
index 2d0edd0..788c2fb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b09495/b09495.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b09495/b09495.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b09495.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10665/b10665.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10665/b10665.ilproj
index 0185bd4..42cbc18 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10665/b10665.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10665/b10665.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b10665.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10666/b10666.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10666/b10666.ilproj
index bb97297..d43ca44 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10666/b10666.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10666/b10666.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b10666.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10894/b10894.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10894/b10894.ilproj
index 445ac38..bff1163 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10894/b10894.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10894/b10894.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b10894.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10897/b10897.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10897/b10897.ilproj
index 3942b76..858eded 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10897/b10897.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10897/b10897.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b10897.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10939/b10939.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10939/b10939.ilproj
index d4e2c87..ebbcbc8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10939/b10939.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10939/b10939.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b10939.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940a.ilproj
index 58d6d6e..bfba720 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b10940a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940b.ilproj
index e75ae40..22f46eb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b10940b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11021/b11021.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11021/b11021.ilproj
index fbd962a..a355e45 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11021/b11021.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11021/b11021.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b11021.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11413/b11413.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11413/b11413.ilproj
index 959e15f..462540e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11413/b11413.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11413/b11413.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b11413.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj
index b85705a..0f0a5cc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b11490.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11949/b11949.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11949/b11949.ilproj
index 4e52e81..f90f5ad 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11949/b11949.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11949/b11949.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b11949.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12274/b12274.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12274/b12274.ilproj
index a74c969..2b4e09b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12274/b12274.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12274/b12274.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b12274.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj
index 2bb23bc..2bf06f4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b12399.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12487/b12487.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12487/b12487.ilproj
index 60255a0..f2e3242 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12487/b12487.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12487/b12487.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b12487.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj
index 7db92f3..86bbdd4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b12624.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13509/b13509.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13509/b13509.ilproj
index 5e6e34c..bf8aead 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13509/b13509.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13509/b13509.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b13509.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13522/b13522.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13522/b13522.ilproj
index 5607601..13b50a4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13522/b13522.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13522/b13522.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b13522.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj
index 86c013e..b468e16 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b13569.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13586/b13586.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13586/b13586.ilproj
index 821cbae..e4e7abb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13586/b13586.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13586/b13586.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b13586.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13738/b13738.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13738/b13738.ilproj
index 63798d5..acc7075 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13738/b13738.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13738/b13738.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b13738.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067a.ilproj
index 6f76ca8..8ba3d7e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14067a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067b.ilproj
index c177c3f..bfc3c71 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14067b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14068/b14068.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14068/b14068.ilproj
index 83daca8..7ef5a8c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14068/b14068.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14068/b14068.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14068.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14070/b14070.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14070/b14070.ilproj
index 3d75e41..df6db60 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14070/b14070.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14070/b14070.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14070.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14135/b14135.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14135/b14135.ilproj
index ab0f1bf..8c289f2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14135/b14135.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14135/b14135.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14135.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14197/b14197.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14197/b14197.ilproj
index e0634c7..30ab675 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14197/b14197.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14197/b14197.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14197.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14199/b14199.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14199/b14199.ilproj
index 8cdf49c..df9e830 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14199/b14199.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14199/b14199.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14199.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14202/b14202.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14202/b14202.ilproj
index aca366f..9c889d3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14202/b14202.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14202/b14202.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14202.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14264/b14264.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14264/b14264.ilproj
index ba27f47..8c9a817 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14264/b14264.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14264/b14264.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14264.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14294/b14294.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14294/b14294.ilproj
index fa226aa..94b30f8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14294/b14294.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14294/b14294.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14294.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14325/b14325.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14325/b14325.ilproj
index 17fe456..3fe65ca 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14325/b14325.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14325/b14325.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14325.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14326/b14326.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14326/b14326.ilproj
index 53f7fdf..98a2d51 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14326/b14326.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14326/b14326.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14326.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14329/b14329.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14329/b14329.ilproj
index 4c719ab..b9d66d4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14329/b14329.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14329/b14329.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14329.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14350/b14350.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14350/b14350.ilproj
index eb118c1..26922bc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14350/b14350.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14350/b14350.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14350.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14431/b14431.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14431/b14431.ilproj
index 3a18f72..6135c27 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14431/b14431.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14431/b14431.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14431.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14591/b14591.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14591/b14591.ilproj
index dfd1743..29584c8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14591/b14591.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14591/b14591.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14591.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj
index 6e44d43..949fde8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14716.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14769/b14769.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14769/b14769.ilproj
index 00b72fd..a23cdb0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14769/b14769.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14769/b14769.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14769.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14770/b14770.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14770/b14770.ilproj
index e448df3..836675b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14770/b14770.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14770/b14770.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14770.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14777/b14777.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14777/b14777.ilproj
index fe1bbcd..54f0554 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14777/b14777.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14777/b14777.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14777.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14927/b14927.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14927/b14927.ilproj
index 26afd88..11c8c81 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14927/b14927.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14927/b14927.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14927.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14928/b14928.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14928/b14928.ilproj
index 8a438cb..4e7ca2c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14928/b14928.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14928/b14928.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14928.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15222/b15222.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15222/b15222.ilproj
index f65f558..3a389b1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15222/b15222.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15222/b15222.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b15222.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15244/b15244.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15244/b15244.ilproj
index ca89202..90041d3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15244/b15244.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15244/b15244.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b15244.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15299/b15299.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15299/b15299.ilproj
index 1072dcc..345a59b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15299/b15299.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15299/b15299.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b15299.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj
index c724a2e..1481640 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b15728.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.ilproj
index f04036b..62f8097 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16039.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16049/b16049.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16049/b16049.ilproj
index 13052a9..8f0c111 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16049/b16049.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16049/b16049.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16049.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16071/b16071.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16071/b16071.ilproj
index a4be9fe..1221bf2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16071/b16071.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16071/b16071.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16071.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj
index 2167a40..9556f1e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b16238.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16241/b16241.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16241/b16241.ilproj
index 9e8de98..83bf05d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16241/b16241.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16241/b16241.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16241.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16295/b16295.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16295/b16295.ilproj
index 33ec59f..c2086d5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16295/b16295.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16295/b16295.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16295.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj
index 606ee00..a9bec4c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b16328.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj
index eb41bb7..9fe3741 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b16335.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj
index da3351e..3d80aba 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b16423.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16498/b16498.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16498/b16498.ilproj
index ec624e7..b94a823 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16498/b16498.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16498/b16498.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16498.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499a.ilproj
index c63993d..36615c6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16499a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499b.ilproj
index d49158e..b378077 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16499b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16500/b16500.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16500/b16500.ilproj
index a644130..63a460a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16500/b16500.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16500/b16500.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16500.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16503/b16503.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16503/b16503.ilproj
index 2db9fa2..714b9ba 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16503/b16503.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16503/b16503.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16503.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16554/b16554.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16554/b16554.ilproj
index 114040b..8f3ae42 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16554/b16554.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16554/b16554.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16554.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881a.ilproj
index 1b82e5f..3eb6e39 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16881a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881b.ilproj
index 8095f1c..e3c31c0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16881b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16886/b16886.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16886/b16886.ilproj
index 11c97c9..04a6761 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16886/b16886.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16886/b16886.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16886.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16895/b16895.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16895/b16895.ilproj
index a30f9d5..28f92d2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16895/b16895.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16895/b16895.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16895.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16896/b16896.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16896/b16896.ilproj
index 0eb5a4d..24a52ff 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16896/b16896.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16896/b16896.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16896.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16922/b16922.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16922/b16922.ilproj
index 0d304f0..e989da0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16922/b16922.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16922/b16922.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16922.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16928/b16928.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16928/b16928.ilproj
index a883b87..1f17b43 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16928/b16928.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16928/b16928.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16928.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b18852/b18852.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b18852/b18852.ilproj
index c78262a..6fe6720 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b18852/b18852.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b18852/b18852.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b18852.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20079/b20079.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20079/b20079.ilproj
index ab776a4..96be0ec 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20079/b20079.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20079/b20079.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b20079.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20217/b20217.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20217/b20217.ilproj
index 3482812..79e5ffd 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20217/b20217.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20217/b20217.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b20217.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20249/b20249.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20249/b20249.ilproj
index 16488cc..2662079 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20249/b20249.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20249/b20249.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b20249.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj
index bf74a44..b1cb500 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b20913.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj
index a98df4a..d3fd612 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b22290.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj
index a0ccee1..651fab2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b24727.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj
index 5f2c7db..de6f5df 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b24728.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25458/b25458.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25458/b25458.ilproj
index 9f9e43e..0c96a31 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25458/b25458.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25458/b25458.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25458.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25459/b25459.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25459/b25459.ilproj
index 0554c35..0602489 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25459/b25459.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25459/b25459.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25459.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25463/b25463.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25463/b25463.ilproj
index b82b3b7..66d4413 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25463/b25463.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25463/b25463.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25463.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25468/b25468.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25468/b25468.ilproj
index 75656f3..848ea6f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25468/b25468.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25468/b25468.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25468-ia64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25474/b25474.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25474/b25474.ilproj
index 5ae5ef8..ad8b0d3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25474/b25474.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25474/b25474.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25474.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25491/b25491.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25491/b25491.ilproj
index 48772a0..3438b78 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25491/b25491.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25491/b25491.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25491.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25507/b25507.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25507/b25507.ilproj
index d44edc8..d1ef38e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25507/b25507.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25507/b25507.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25507.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj
index f5727a1..63fbf1c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b25647.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25701/b25701.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25701/b25701.ilproj
index bec5b8e..4ba57cc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25701/b25701.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25701/b25701.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25701-ia64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25739/b25739.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25739/b25739.ilproj
index 23e04ec..381a05f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25739/b25739.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25739/b25739.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25739.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25813/b25813.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25813/b25813.ilproj
index 7ec2fc2..4eb582b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25813/b25813.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25813/b25813.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25813.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25815/b25815.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25815/b25815.ilproj
index fe90304..0a6a773 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25815/b25815.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25815/b25815.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25815.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25833/b25833.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25833/b25833.ilproj
index 36884d7..9e5d5a9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25833/b25833.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25833/b25833.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25833.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25835/b25835.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25835/b25835.ilproj
index b3fb501..8a81de2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25835/b25835.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25835/b25835.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b25835.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26020/b26020.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26020/b26020.ilproj
index 7c13a9b..7dbc3e7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26020/b26020.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26020/b26020.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b26020.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26153/b26153.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26153/b26153.ilproj
index 5e251df..5d01227 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26153/b26153.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26153/b26153.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b26153.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26155/b26155.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26155/b26155.ilproj
index ab10413..20e2797 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26155/b26155.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26155/b26155.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b26155.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26332/b26332.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26332/b26332.ilproj
index e23ad1b..c948e7d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26332/b26332.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26332/b26332.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b26332.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26512/b26512.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26512/b26512.ilproj
index f3b0660..3cac5b3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26512/b26512.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26512/b26512.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b26512.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj
index 7488522..9e8545e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b26558.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj
index aea8c4d..fbac188 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b26560.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj
index 306c9c1..a8c8891 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b26732.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26748/b26748.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26748/b26748.ilproj
index d3df571..ecbb6b0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26748/b26748.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26748/b26748.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b26748.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj
index 28b00f7..b945409 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b26863.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26888/b26888.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26888/b26888.ilproj
index 4b80406..fef7af2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26888/b26888.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26888/b26888.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b26888.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26957/b26957.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26957/b26957.ilproj
index 2d78646..a594493 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26957/b26957.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26957/b26957.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b26957.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27535/b27535.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27535/b27535.ilproj
index a530eb3..2562b13 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27535/b27535.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27535/b27535.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b27535.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27538/b27538.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27538/b27538.ilproj
index 2c26878..734e1d8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27538/b27538.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27538/b27538.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b27538.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27564/b27564.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27564/b27564.ilproj
index 9daa8da..b0692db 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27564/b27564.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27564/b27564.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b27564.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27657/b27657.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27657/b27657.ilproj
index 6ea8b1b..ac37401 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27657/b27657.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27657/b27657.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b27657.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27658/b27658.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27658/b27658.ilproj
index 6014503..64a523d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27658/b27658.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27658/b27658.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b27658.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj
index d25dbf8..f723b43 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b27811.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj
index 6bf7c29..28fb243 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b27819.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj
index 51f1f1d..90733f0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b27824.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27880/b27880.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27880/b27880.ilproj
index de0b804..263da28 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27880/b27880.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27880/b27880.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b27880.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27883/b27883.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27883/b27883.ilproj
index 20cb9b6..7a1c581 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27883/b27883.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27883/b27883.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b27883.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27917/b27917.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27917/b27917.ilproj
index ba8e911..87e30f2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27917/b27917.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27917/b27917.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b27917.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj
index 3123e87..3186c5a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b28037.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj
index 304ad2d..4e7ef73 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b28042.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28080/b28080.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28080/b28080.ilproj
index 15f7ea5..3d99ca7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28080/b28080.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28080/b28080.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28080.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28522/b28522.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28522/b28522.ilproj
index a0e86f2..5baf1cc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28522/b28522.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28522/b28522.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28522.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28594/b28594.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28594/b28594.ilproj
index 1999994..f6bc4e9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28594/b28594.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28594/b28594.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28594.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28595/b28595.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28595/b28595.ilproj
index 06e531e..fd1dcb3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28595/b28595.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28595/b28595.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28595.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28596/b28596.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28596/b28596.ilproj
index c7d1018..c9efe83 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28596/b28596.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28596/b28596.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28596.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28597/b28597.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28597/b28597.ilproj
index 1949e7e..37eba16 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28597/b28597.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28597/b28597.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28597.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj
index ee73a4c..33c1884 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b28776.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj
index 97b1716..0c2d6c1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b28787.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj
index 0b39fd1..29b2eb1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b28790.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28805/b28805.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28805/b28805.ilproj
index cc4ca01..aca0dd2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28805/b28805.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28805/b28805.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28805.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28806/b28806.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28806/b28806.ilproj
index 9c85d97..9e736f1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28806/b28806.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28806/b28806.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28806.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj
index 8f81956..bf71fca 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28901.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28927/b28927.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28927/b28927.ilproj
index 31a6be9..adfaee9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28927/b28927.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28927/b28927.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28927.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.ilproj
index 6565586..e024d03 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b29583.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.ilproj
index 81ed25b..7d0a7dd 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b30125.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj
index d017c02..6903d5a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b30126.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj
index 25a6e38..cd6451a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b30128.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj
index 9c5556b..d174a92 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b30630.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30792/b30792.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30792/b30792.ilproj
index 4d2c8f7..740e603 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30792/b30792.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30792/b30792.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b30792.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30799/b30799.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30799/b30799.ilproj
index 2764c0b..c0b2721 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30799/b30799.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30799/b30799.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b30799.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj
index 028c8ba..e5fe164 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b30838.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.ilproj
index 80d3be6..0554ef0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b30862.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj
index ee9bccd..4a8650e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b30864.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30869/b30869.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30869/b30869.ilproj
index 958f2a6..d464696 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30869/b30869.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30869/b30869.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b30869.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.ilproj
index a378edf..c88099e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b30892.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.ilproj
index d295b43..7d1f31a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31102.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.ilproj
index 5206a8f..717a701 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31273.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.ilproj
index 0ebd97a..1169e65 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31321.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.ilproj
index 94e0cbb..6c3fadc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31343.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.ilproj
index 7af0143..afcb279 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31448.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj
index df759e2..022e3fc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31732.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj
index 415414a..d4ba8ec 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31748.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj
index 43768ff..6ea28de 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31749.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj
index 8e74397..799a2f3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31763.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj
index fc1f785..b646df5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31912.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.ilproj
index 30a28c6..dce0010 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b32093.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj
index 8e5d067..abe6346 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b32303.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj
index f18c68b..1304c98 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b32345.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj
index aee5571..9bc4784 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b32374.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551a.ilproj
index 920a648..ed0d9a4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b32551a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551b.ilproj
index 4477e3d..1a9f463 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b32551b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj
index 854cbe2..0730024 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b32560.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj
index 2b8b27e..8159bc1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b32801.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.ilproj
index feea1e4..5a4f495 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b34423.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj
index dd120c7..273c87d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b13170.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj
index 7dd4049..4489fae 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b13178.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj
index 492fbe1..265e306 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b13647.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj
index c2ac974..6925ea1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14057.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj
index fb9fcfb..891cecf 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14059.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj
index f60375f..5ec9ab7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14277.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj
index a6c3498..51417c2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14314.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj
index f93c2d1..e7112af 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14367.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj
index c799b47..99f2614 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14396.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj
index f24d432..ff1eed0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14422.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj
index 62a8549..f4a31a4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14428.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj
index 6a274df..140cff6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14443.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj
index 3e7802a..6175c88 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14616.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj
index d764fac..3f6d1e7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14624.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj
index 5c9ff0f..107ce01 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14640.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj
index 559b311..f3875d9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b14673.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj
index a23eae0..64ba27c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b15155.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj
index c335a75..c3f610e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b15468.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj
index 132bb3d..70b781b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b15526.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj
index 6ddd6ef..6b08d56 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b15783.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj
index 3612629..619f147 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b15786.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj
index d4a2d61..2c4b4a4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b15797.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj
index 42c8834..62eecc0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b15864.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj
index 00a21eb..e7e0bb9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b16294.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02043/b02043.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02043/b02043.ilproj
index 8dce9be..f50d114 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02043/b02043.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02043/b02043.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b02043.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj
index 9ffe88f..084fc62 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b02051.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02062/b02062.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02062/b02062.ilproj
index e663e67..7479910 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02062/b02062.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02062/b02062.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b02062.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj
index cd3e6fe..b15534b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b02076.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b03995/b03995.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b03995/b03995.ilproj
index 4a2c686..1bdd941 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b03995/b03995.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b03995/b03995.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b03995.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04083/b04083.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04083/b04083.ilproj
index 1bd8c9e..fa0c4cb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04083/b04083.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04083/b04083.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04083.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04250/b04250.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04250/b04250.ilproj
index 9f8ee83..f00b193 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04250/b04250.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04250/b04250.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04250.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04257/b04257.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04257/b04257.ilproj
index a5d5089..c54ac7f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04257/b04257.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04257/b04257.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04257.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04306/b04306.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04306/b04306.ilproj
index bb9d5f5..05c3e83 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04306/b04306.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04306/b04306.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04306.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj
index b6b2e1a..4c959b1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="B04345.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04384/b04384.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04384/b04384.ilproj
index b7c5a73..a9aa20b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04384/b04384.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04384/b04384.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04384.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04538/b04538.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04538/b04538.ilproj
index e3ee546..d0f9333 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04538/b04538.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04538/b04538.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04538.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04574/b04574.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04574/b04574.ilproj
index f551004..8c0c389 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04574/b04574.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04574/b04574.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04574.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04583/b04583.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04583/b04583.ilproj
index 15e5852..b578f25 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04583/b04583.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04583/b04583.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04583.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04612/b04612.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04612/b04612.ilproj
index 953550f..889f8a1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04612/b04612.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04612/b04612.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04612.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04639/b04639.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04639/b04639.ilproj
index e74866d..6dcee75 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04639/b04639.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04639/b04639.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04639.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04726/b04726.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04726/b04726.ilproj
index c8c1c94..07ce6a5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04726/b04726.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04726/b04726.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04726.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05214/b05214.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05214/b05214.ilproj
index 18552c4..ab1ce10 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05214/b05214.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05214/b05214.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05214.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj
index acd1dd0..60f0bf6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b05477.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05617/b05617.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05617/b05617.ilproj
index 6064245..0b47ca8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05617/b05617.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05617/b05617.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05617.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05619/b05619.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05619/b05619.ilproj
index c1446c9..ffaa68d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05619/b05619.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05619/b05619.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05619.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05621/b05621.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05621/b05621.ilproj
index 0cc1e83..44d677f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05621/b05621.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05621/b05621.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05621.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05622/b05622.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05622/b05622.ilproj
index d03c627..7993f36 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05622/b05622.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05622/b05622.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05622.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05637/b05637.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05637/b05637.ilproj
index fdf1f1e..d102597 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05637/b05637.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05637/b05637.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05637.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05639/b05639.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05639/b05639.ilproj
index 576172a..e82f1b6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05639/b05639.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05639/b05639.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05639.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05737/b05737.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05737/b05737.ilproj
index 16d6c09..dc7c7d7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05737/b05737.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05737/b05737.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05737.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05740/b05740.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05740/b05740.ilproj
index 5a65333..697335e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05740/b05740.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05740/b05740.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05740.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05773/b05773.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05773/b05773.ilproj
index f90cd2f..2fac462 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05773/b05773.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05773/b05773.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05773.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05780/b05780.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05780/b05780.ilproj
index f1f9432..9350ca1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05780/b05780.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05780/b05780.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05780.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05784/b05784.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05784/b05784.ilproj
index 23a7971..91ee945 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05784/b05784.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05784/b05784.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05784.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05933/b05933.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05933/b05933.ilproj
index 4853e25..0c62e94 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05933/b05933.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05933/b05933.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05933.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06435/b06435.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06435/b06435.ilproj
index 0bbf5d1..fb14199 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06435/b06435.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06435/b06435.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b06435.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06436/b06436.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06436/b06436.ilproj
index 4f57d3a..b8503b2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06436/b06436.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06436/b06436.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b06436.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj
index 441855c..5fbe9c1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b06464.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06595/b06595.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06595/b06595.ilproj
index 060add6..d265c8b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06595/b06595.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06595/b06595.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b06595.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj
index 2fff983..229b0d4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b06680.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06730/b06730.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06730/b06730.ilproj
index 979bbd2..857e659 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06730/b06730.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06730/b06730.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b06730.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06754/b06754.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06754/b06754.ilproj
index d7bf043..2b1db40 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06754/b06754.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06754/b06754.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b06754.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj
index e5e8922..4f06000 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b06859.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj
index ca0ab00..6c58a42 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b06924.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07082/b07082.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07082/b07082.ilproj
index 526d873..c50b9bb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07082/b07082.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07082/b07082.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b07082.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07411/b07411.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07411/b07411.ilproj
index 6beae2e..fb19bc8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07411/b07411.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07411/b07411.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b07411.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07458/b07458.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07458/b07458.ilproj
index 4e2101f..53cdc86 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07458/b07458.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07458/b07458.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b07458.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07704/b07704.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07704/b07704.ilproj
index ce279e5..5eda11b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07704/b07704.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07704/b07704.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b07704.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08107/b08107.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08107/b08107.ilproj
index 0f4205c..1ce9731 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08107/b08107.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08107/b08107.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b08107.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08109/b08109.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08109/b08109.ilproj
index 6cf62e0..5157886 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08109/b08109.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08109/b08109.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b08109.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08672/b08672.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08672/b08672.ilproj
index 4fa4acb..463574c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08672/b08672.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08672/b08672.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b08672.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08797/b08797.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08797/b08797.ilproj
index df3933a..284b6c8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08797/b08797.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08797/b08797.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b08797.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj
index cdbf1a0..1bbb498 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b08944a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj
index 87f9884..c9cf434 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b08944b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09254/b09254.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09254/b09254.ilproj
index c0f9ad9..9e7df87 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09254/b09254.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09254/b09254.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b09254.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj
index 2b60b3c..344ea5e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b09287.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj
index 04a9058..b428edf 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b09452.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj
index 0ef7aa5..b885bb7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b13330.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj
index 1f9c50b..07c3d9a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b13466.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b27873/b27873.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b27873/b27873.ilproj
index 176c910..157cdca 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b27873/b27873.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b27873/b27873.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b27873.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.ilproj
index 97d1ce7..2166dd7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b29351.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj
index bc132d9..d8f738f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b30586.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj
index 86ab946..2b15e3a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31878.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.ilproj
index d090fc5..6a7b717 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33759.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.ilproj
index 8568c3d..0943f74 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33792.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.ilproj
index cea4e1c..b11def4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33888.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.ilproj
index d3d24a8..b9f0d24 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33922.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.ilproj
index 41e3106..b7b2075 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33928.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj
index 39807bf..c779e82 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b34945.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj
index e72d700..ceec88d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35784.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.ilproj
index a3c82cf..3a81825 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b36030.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj
index 70d09ef..1f90a90 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b36274.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj
index 3681e85..29b8bec 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b36332.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj
index 8609c72..6681879 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b36470.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj
index 49a3f1a..e1053cd 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b36471.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
index ba1cf49..c520212 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b36472.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj
index 84595a7..c53dcb3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b37131.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
index afdff7b..9e6f8bf 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b37598.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj
index fc416a4..59428b7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b37608.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj
index 1db2758..001ed1e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b37636.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj
index cc21c00..2933a4c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b38403.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj
index 4f8e481..e6ece61 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b38556.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj
index 2e0f0c4..6aeec24 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b39217.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj
index 3c7acbf..d24b934 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b39224.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.ilproj
index 372037b..38a990f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b39381.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.ilproj
index 02a0bf9..a0f65e4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b39397.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.ilproj
index 0e73db5..6363efc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b39417.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.ilproj
index 2207993..231db9d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b39455.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.ilproj
index 498e66a..4ec8a2b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b39946.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj
index 2e58eba..3288412 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b39951.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj
index 2d9d63c..7c0f3fd 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b40141.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.ilproj
index 0d269c1..579900a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b40174.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.ilproj
index 904640f..f437813 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b40199.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj
index 86bcdec..3da05e3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b40216.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj
index 453de4b..0b6bc88 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b40221.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.ilproj
index 5c2c957..4e747f5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b40269.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.ilproj
index 80be22c..77b420e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b40347.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.ilproj
index 9f34ef4..0cbed50 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b40380.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.ilproj
index ea2e776..66500c3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b40411.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj
index 77be9db..27f52a3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b40496.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj
index c88b52e..f8a7d1a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b40521.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.ilproj
index fb91b35..b6ecdbc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b40721.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.ilproj
index 25b4af4..30fcbfe 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b40725.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.ilproj
index 19248b1..89cd2b6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b41002.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj
index a57cecd..92c25a4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b41063.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.ilproj
index 7504601..17fac4f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b41126.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.ilproj
index 7f16c7f..5ebdb9a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b41129.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.ilproj
index f8c4c99..b5462cf 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b41149.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.ilproj
index 8fb6ee2..674d18f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b41164.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj
index 487554d..299eb31 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b41234.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41262/b41262.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41262/b41262.ilproj
index 2cb000b..f311c6f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41262/b41262.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41262/b41262.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b41262.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.ilproj
index c548b63..391b0fa 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b41278.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj
index 54ecc91..e0df9ee 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b41391.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj
index 6e17f26..8e41cc1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b41470.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj
index b5aab5c..50a38c1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b41488.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj
index 75ebb7e..c0a0479 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b41495.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj
index 6d158c6..b98da9e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b41621.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.ilproj
index aaa3a55..2467d75 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b41627.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj
index 4073b8e..9587e84 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b41918.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj
index 2b799e2..d0f8638 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b42009.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj
index 950f167..e84d53e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b42013.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.ilproj
index 935e56a..2ca9177 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b42387.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.ilproj
index 270adc4..b4eeb99 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b42732.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj
index 21aa4df..7bceb94 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b42918.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj
index d9980be..3c60195 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b42929.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj
index 680d971..fa57723 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b43010.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.ilproj
index 7b7cf7c..b3bc19f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b43033.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.ilproj
index 3c08958..68418e5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b43040.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.ilproj
index 2051612..dadaad9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b43069.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.ilproj
index 1e96b35..566d5f5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b43115.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.ilproj
index 8b8369d..da643a9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b43121.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.ilproj
index b3a1d2c..1f49b72 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b43160.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj
index 56e3d90..69558a6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b43313.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.ilproj
index 6a57981..475766f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b43378.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.ilproj
index e54f4cc..8bd996c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b43714.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj
index 85b3a1a..bf9934f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b43719.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj
index efc018f..21705fa 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b43958.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.ilproj
index 8def6fd..313919c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b43963.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.ilproj
index ccd5fa7..7f19b79 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b43994.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.ilproj
index ee2384b..18c6d97 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44020.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj
index c789366..7da8d20 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b44193.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.ilproj
index 8a136e1..057f9c9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44204.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.ilproj
index 995aabb..2d1ee7d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44224.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj
index f34db3d..d5d3685 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b44297.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj
index e3514ac..966a175 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b44410.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.ilproj
index b296bd4..f647c05 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44657.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.ilproj
index 7ae163d..fe1dd0c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44723.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.ilproj
index 63429f3..2b2bc82 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44724.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.ilproj
index de5b552..49d9697 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44861.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.ilproj
index 67b7ea6..b4eda99 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44879.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.ilproj
index 6ac9a76..7c93521 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44946.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.ilproj
index d2f3bd1..7839d38 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44983.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.ilproj
index c0d37b5..5af1f85 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44984.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.ilproj
index 00a9304..c287ae7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b44985.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj
index a1b0889..4f2678f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b45015.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj
index 604b59c..5ba1f80 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b45259.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj
index a08659a..c1f558e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b45270.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.ilproj
index 360a0d2..e3d8070 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b45439.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj
index 8e10d7e..a5e8ca0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b45458.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj
index bf76480..2935b8a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b45535.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.ilproj
index 1e3dc07..9d50434 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b45541.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.ilproj
index 4a4b5f9..5ba1f5d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b45956.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.ilproj
index 542907f..b46b481 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b45984.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.ilproj
index c204569..a07bbcc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b45985.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj
index 15bbcf5..f84aff8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b46170.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.ilproj
index 806c64a..4ac230f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b46292.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.ilproj
index 586158a..75942e8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b46569.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.ilproj
index 5aa5dca..e18955f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b46576.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.ilproj
index 5ebe825..9da1eb5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b46583.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj
index c3caa62..bbec7fd 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b46629.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj
index e7727e1..c9c6e4e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b46641.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj
index d780048..2a9afdb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b46649.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
index c94cd94..273a72c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b46867.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.ilproj
index 32405ab..0ec3288 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b46897.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.ilproj
index f47f940..b2b5a3a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b47022.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj
index 3055000..36b1376 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b47047.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080.ilproj
index 2ad9536..217a0c7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b47080-ia64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.ilproj
index 52a50fd..9d05ae9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b47093.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.ilproj
index af6594c..c649799 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b47610.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.ilproj
index bca3ff9..4aa143f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b47885.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.ilproj
index a45195d..a41bd53 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b47906.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj
index 8cb5052..28029ea 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b48248.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.ilproj
index 6fa0bfb..99d3e9e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b48350.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554a.ilproj
index 52df9a0..ed6e17d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b48554a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554b.ilproj
index 70554df..4397f78 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b48554b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.ilproj
index 443d325..321767f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b48614.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj
index 7d7a9ed..c674d06 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b48797.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj
index 4a7105d..24bec3d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b48805.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj
index 841437d..10c1222 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b48864.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj
index c0a63a0..f659571 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b48872.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj
index 0da0fe5..0fb33f3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b48990a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj
index 92bb04b..48733c4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b48990b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.ilproj
index 72f23d1..4107062 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b49101.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj
index 641340b..a4edc81 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b49318.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj
index 8f1660c..19e8016 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b49322.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj
index 94b59ba..4265827 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b49717.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.ilproj
index 0431d07..294019a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b49984.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b16122/b16122.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b16122/b16122.ilproj
index 8d48392..cceab23 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b16122/b16122.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b16122/b16122.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b16122.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b18857/b18857.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b18857/b18857.ilproj
index fad21fe..4b80463 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b18857/b18857.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b18857/b18857.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b18857.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28598/b28598.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28598/b28598.ilproj
index 8c70648..e1971cd 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28598/b28598.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28598/b28598.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28598.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28949/b28949a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28949/b28949a.ilproj
index 08e49d3..858fa84 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28949/b28949a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28949/b28949a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b28949a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.ilproj
index 0706ca7..fa55d12 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b30868.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj
index ba4d041..81cc65d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31182.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.ilproj
index d10f49e..b118ca6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31283.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.ilproj
index c40691f..9d2b427 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31289.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.ilproj
index 8b451fb..4b28764 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31292.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.ilproj
index 245a502..3c6303e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31423.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.ilproj
index cbba349..6f193de 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31452.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.ilproj
index 5652105..648f6ef 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31493.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.ilproj
index e4b23c6..0fced30 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31547.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
index 9d80258..e57d1e8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31745.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj
index 472c052..2c3c68d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31746.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj
index b0ef022..0c73710 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31762.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.ilproj
index d916b84..0633097 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31780.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.ilproj
index dd28cca..2084225 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b31784.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj
index c4496e4..368cd74 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31903.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj
index 3ac5153..37160bd 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b31917.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32613/b32613.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32613/b32613.ilproj
index b2109fc..b547733 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32613/b32613.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32613/b32613.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b32613.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.ilproj
index 6da5901..48c0581 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b32614.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.ilproj
index ba48bfb..c74b1eb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33125.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.ilproj
index 621ee1c..81737bf 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33131.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.ilproj
index 83a1d1e..011e3e5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33135.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.ilproj
index 5d4abc9..9f55c56 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33335.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.ilproj
index cdd5145..c29f25c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33361.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.ilproj
index 9cc2923..11cf534 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33362.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.ilproj
index 3e83b9c..b2a8969 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33388.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.ilproj
index f0c14f2..7749d8d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33585.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.ilproj
index bcb569e..d7a35ac 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b33586.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.ilproj
index a7fa5e9..5f5900e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b34951.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.ilproj
index d910976..4a3d912 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b34952.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.ilproj
index e0f811c..d6f8217 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b34953.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.ilproj
index 14a89e5..7c9017b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35315.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.ilproj
index 95697a9..35cb31c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35344.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.ilproj
index 03ef2af..3a04350 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35348.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.ilproj
index 02eaaa2..95da921 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35351.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.ilproj
index 75eb816..db01126 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35354.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.ilproj
index 48dc860..9e9a1e9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35366.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.ilproj
index 1d9260c..1627d0e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35486.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.ilproj
index 1e15d96..0870d7a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35635.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.ilproj
index 23f7ed3..6f434d1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b35779.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.ilproj
index 51aef70..8b4aa27 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b36301.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.ilproj
index 7715f18..974b48a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b36302.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.ilproj
index 05d65af..d9cff4d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b36304.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.ilproj
index 7eea0fd..6733f2f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b36975.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.ilproj
index f54282a..38fbdca 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b37214.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.ilproj
index 53595ca..5dc2d8f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b37215.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.ilproj
index 56b5e4b..e6ba32a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b37238.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.ilproj
index eeb54e1..0544ac8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b37256.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.ilproj
index d6a62fd..bc14461 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b37578.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj
index 0bb9492..134ed86 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b37646.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.ilproj
index 9f0a2d0..5efd41f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b37830.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj
index 09a43f7..b0d7570 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b38269.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.ilproj
index e138b85..e4b6901 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b40006.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40347/b40347.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40347/b40347.ilproj
index 80be22c..77b420e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40347/b40347.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40347/b40347.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b40347.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj
index eb46d24..98de9a3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b41852.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b46566/b46566.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b46566/b46566.ilproj
index ce5eaa2..3415513 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b46566/b46566.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b46566/b46566.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b46566.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.ilproj
index 9268bfd..ed2b2da 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b47471.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.ilproj
index fc7d637..a5e9ce3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b47886.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj
index 524cae2..b62d525 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b47975.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj
index 68ad18b..a512ed8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b48929.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.ilproj
index e4d8c99..1edd313 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b49104.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49142/b49142.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49142/b49142.ilproj
index db02126..ab9b7af 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49142/b49142.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49142/b49142.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b49142.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.ilproj
index 1038616..7715b30 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b49335.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435.ilproj
index 3451877..f630365 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b49435-ia64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj
index 0327d40..b9e6370 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b49809.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.ilproj
index 48d7386..cad6563 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b50026.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.ilproj
index 62c6884..8add3f6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b50027.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.ilproj
index 9e1fb30..6796dd0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b50033.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj
index f4e5a0d..f70a830 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b50042.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj
index c545feb..05134c5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b50145.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj
index 15889fc..adb2e0f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b50145a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj
index f003836..7fdaab3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b50145b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj
index c4b77d7..23d70e8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b50145c.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj
index b63b1e5..4091b99 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b50535.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.ilproj
index 4632141..20a290d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b51420.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj
index 601e339..e55d030 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b51463.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj
index b28bd4b..e9ea2f8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b51469.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.ilproj
index 196d77c..a20664a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b51515.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj
index 1c98447..e61b53a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b51565.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.ilproj
index 6255abd..5ace10f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b51575.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj
index 7fa2983..7ca75b7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b51870.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj
index a26b83a..77b764c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b52572.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj
index 2e5e6ae..768b272 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b52578.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj
index ebb16cd..025aa92 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b52746.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj
index 1e09b18..81904f9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b52760.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj
index 4df7245..811e469 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b52838.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj
index 80a6be7..63d8736 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b52839.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.ilproj
index e88283c..aac78da 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53650.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.ilproj
index 99d8a1c..4d223dc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53662.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.ilproj
index 4885f29..2aa0dc3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53878.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.ilproj
index a0e29e1..caa02cc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53884.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942a.ilproj
index 9cc2b9b..ebe2087 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53942a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942b.ilproj
index 4b5810f..48aa30e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53942b.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.ilproj
index d211adc..ecf6e83 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53958.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.ilproj
index a9560a1..de011d7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53977.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.ilproj
index 1e1a35b..f7d67e3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53980.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.ilproj
index bc41a25..1bb39fc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53994.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.ilproj
index b66a862..686c0d7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b53995.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.ilproj
index 288f976..bf108fd 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b54006.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.ilproj
index b37cd8e..debc329 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b54565.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.ilproj
index e8f9848..9924b29 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b54566.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.ilproj
index a209dd5..222523b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b54611.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj
index 33f6244..cbf5782 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b54667.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.ilproj
index d5899b0..02c32e2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b54971.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj
index ea3b0c7..5be6abc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b55197.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55216/b55216.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55216/b55216.ilproj
index 06f5625..d205721 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55216/b55216.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55216/b55216.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b55216.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55875/b55875.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55875/b55875.ilproj
index 2698850..bca684a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55875/b55875.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55875/b55875.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b55875.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.ilproj
index a41572c..1505191 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b55923.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.ilproj
index 46f7b29..0e1e87a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b56066.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.ilproj
index a823fdd..e02c2cb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b56068.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj
index dc29be8..018ac38 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b56149.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj
index 0aaa8cd..288900a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b56154.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj
index 8e7693c..3381541 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b56159.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56174/b56174.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56174/b56174.ilproj
index 54c29c3..22ff868 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56174/b56174.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56174/b56174.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b56174.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.ilproj
index e05daf5..0d50445 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b56349.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56780/b56780.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56780/b56780.ilproj
index b4fa73c..b7c0994 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56780/b56780.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56780/b56780.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b56780.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.ilproj
index a2a7d9f..82159a3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b57492.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.ilproj
index c525a77..50064d1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b57493.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.ilproj
index 2fd5265..5224f5e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b57516.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.ilproj
index 28d4bfd..8430a3e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b57518.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.ilproj
index d02f18f..adefa76 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b57952.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.ilproj
index 8f80031..ce43e60 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b58358.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.ilproj
index 3a26677..32d7eef 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b58360.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.ilproj
index d0af92d..0c6ad2a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b58689.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.ilproj
index e3136de..3b3e552 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b58690.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.ilproj
index d35ea0f..8c99e7c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b58866.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj
index a64b0a7..c2f5eb4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b59297.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.ilproj
index a2ccfaf..a52b69e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59319.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.ilproj
index bdffbdc..07be602 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59320.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.ilproj
index 5051fbf..34a75c8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59337.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.ilproj
index e5d478e..3f81fab 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59477.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.ilproj
index d212db8..2c05939 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59478.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.ilproj
index c8df9c2..622b842 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59508.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.ilproj
index 2b0f5b2..654284a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59554.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.ilproj
index 26bfc93..29b20d5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59647.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.ilproj
index a8578b6..9149572 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59782.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.ilproj
index b66b3f8..b042f85 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59822.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59857/b59857.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59857/b59857.ilproj
index 90ac8d7..024b315 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59857/b59857.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59857/b59857.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59857.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59858/b59858.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59858/b59858.ilproj
index fcf2f46..2edcadd 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59858/b59858.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59858/b59858.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59858.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.ilproj
index 342de9e..1d2ad3d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59947.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.ilproj
index 64beae0..9912c0f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59948.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.ilproj
index 24efa1a..f46c539 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59949.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.ilproj
index 0d7c48f..bb63982 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59952.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.ilproj
index f8a0e71..5698344 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b59953.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.ilproj
index f2498e6..9151528 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b60127.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.ilproj
index 30ece49..bf81e5b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b60142.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.ilproj
index 9e19ec5..95ee3b2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b60194.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj
index 09afeef..421301e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b60723.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.ilproj
index 9029807..a597ff9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b61025.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj
index 8cc977a..29c3075 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b61028.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.ilproj
index 045300a..8abb03d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b61185.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.ilproj
index 3e3ff39..e23422e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b61215.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj
index bc71484..f902cb2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b61515.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj
index 4842087..de4fd09 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b61640.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.ilproj
index 2c6344d..046cb6c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b62145.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj
index 2172e83..51a117a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b62498.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj
index d27f205..e05c2b7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b62555.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj
index 522f9ad..b1afeb6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b62892.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj
index 1ceb54f..4817184 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b63183.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.ilproj
index acb98ec..3e61ed3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b63552.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.ilproj
index eceebd1..f35a77f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b63725.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.ilproj
index da56a40..fae1e28 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b63726.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.ilproj
index 9f5315a..c71545f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b63730.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.ilproj
index 3907f87..082d546 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b63732.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.ilproj
index 032323e..95ae322 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b63823.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.ilproj
index 250eebe..9dbc18d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b64026.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.ilproj
index 778063f..6908882 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b64560.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.ilproj
index aed7f4f..27745dc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b65087.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.ilproj
index bcc7cfb..357d08b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b65176.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.ilproj
index 55ee4e7..f250070 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b65407.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.ilproj
index ae29636..5e7ec89 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b66226.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.ilproj
index 53b3314..5b5414e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b66425.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.ilproj
index 114c85b..819b2c6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b66583.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj
index a5700b9..7b85036 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b66620.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.ilproj
index 042e1fc..5f797e7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b66679.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.ilproj
index 99f49b0..e4ba715 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b67351.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.ilproj
index 61554dd..dc427b4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b67744.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.ilproj
index ecd8a55..080b643 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b67819.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.ilproj
index 76e56a8..7387707 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b67987.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.ilproj
index 5b91691..2619bc8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b68028.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.ilproj
index 42e8217..6ca6aca 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b68045.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj
index a25b606..2ee7c50 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b68361.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj
index 19e64e8..d954006 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b68634.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.ilproj
index a40e1fa..9c3cd45 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b68872.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.ilproj
index b83f2c2..48e78b2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b69225.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.ilproj
index 8a7eea3..093bf5d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b69227.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.ilproj
index a106e36..c02b281 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b69512.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.ilproj
index e4ce66a..5dfe275 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b69528.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.ilproj
index b3c146a..96dcc76 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b69848.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.ilproj
index 33d68e4..09f96c6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b70267.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.ilproj
index e241a92..0d9996e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b70289.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.ilproj
index 4753821..d988727 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b70335.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70354/b70354.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70354/b70354.ilproj
index e1d0b5a..f52fca9 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70354/b70354.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70354/b70354.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b70354.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.ilproj
index ee461d5..ec2f17f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b70808.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70909/b70909.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70909/b70909.ilproj
index af537e5..3f54920 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70909/b70909.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70909/b70909.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b70909.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.ilproj
index 200093a..18a7813 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b70964.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.ilproj
index 5069e18..27f6d70 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b70967.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.ilproj
index 4494391..a355d13 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b70992.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.ilproj
index 9554b69..4328107 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b70994.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.ilproj
index d86ba67..6052de1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b71003.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj
index e3c9c14..7f5fb6f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b71099.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj
index aa7044d..98f0942 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b71120.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj
index 3f00b4a..8c2f7e2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b71135.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj
index 9bc262a..0517196 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b71155.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.ilproj
index e17c726..8080767 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b71179.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj
index 7f68c92..d9ae4d5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b71231.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71318/b71318.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71318/b71318.ilproj
index 5cff17b..6bbd607 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71318/b71318.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71318/b71318.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b71318.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.ilproj
index bdd0439..1679d00 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b71722.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71831/b71831.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71831/b71831.ilproj
index eaba75a..6f0730b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71831/b71831.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71831/b71831.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b71831.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71869/b71869.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71869/b71869.ilproj
index 2114f25..2cdd0ca 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71869/b71869.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71869/b71869.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b71869.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.ilproj
index f5e4363..11b0026 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b71999.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj
index b6a2e31..51cf8be 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b72136.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72160/b72160.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72160/b72160.ilproj
index b94b311..665eab2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72160/b72160.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72160/b72160.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b72160.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72161/b72161.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72161/b72161.ilproj
index 5fb35c1..761a15e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72161/b72161.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72161/b72161.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b72161.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.ilproj
index 0dacef6..5f4227d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b72518.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.ilproj
index 4d12b96..34e5827 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b72522.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.ilproj
index f17b49f..0a16ad1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b72699.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72828/b72828.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72828/b72828.ilproj
index 1131ec8..7dc212f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72828/b72828.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72828/b72828.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b72828.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj
index 8656b94..b815250 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b72996.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.ilproj
index 90b1894..aad5725 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b73079.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73207/b73207.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73207/b73207.ilproj
index c1ad97a..e13798f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73207/b73207.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73207/b73207.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b73207.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.ilproj
index 2d6555b..69a02e3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b73283.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73786/b73786.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73786/b73786.ilproj
index b5115ac..c170655 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73786/b73786.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73786/b73786.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b73786.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj
index 27ee60e..41cf608 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b73921.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj
index 8b5a623..97634ae 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b74182.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74608/b74608.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74608/b74608.ilproj
index dc1f169..62ebccf 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74608/b74608.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74608/b74608.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b74608.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.ilproj
index e9806ed..0f785e6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b74937.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74939/b74939.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74939/b74939.ilproj
index ea2d5c8..e5d07f3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74939/b74939.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74939/b74939.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b74939.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74976/b74976.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74976/b74976.ilproj
index 558b69d..995a0c3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74976/b74976.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74976/b74976.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b74976.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj
index 974059c..172d7e5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b75250.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj
index c9a6d7c..d268340 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b75509.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75888/b75888.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75888/b75888.ilproj
index 667f7b5..121042e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75888/b75888.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75888/b75888.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b75888.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75890/b75890.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75890/b75890.ilproj
index d791ced..d7c07f0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75890/b75890.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75890/b75890.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b75890.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75944/b75944.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75944/b75944.ilproj
index e5d97da..1cb2ea7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75944/b75944.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75944/b75944.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b75944.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.ilproj
index 92a5297..e6f3546 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b75945.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj
index e8e1e5a..1bae050 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b76590.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77304/b77304.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77304/b77304.ilproj
index 708bf5b..88a1061 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77304/b77304.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77304/b77304.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b77304.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj
index 73d3c5c..3d63a11 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b77707.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj
index 9497386..1419984 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b77713.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.ilproj
index 9b5f849..3c5047c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b77806.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77950/b77950.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77950/b77950.ilproj
index af95f7c..d3685da 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77950/b77950.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77950/b77950.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b77950.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj
index b831bcf..216e498 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b78392.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj
index 3330b74..151ea84 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b79250.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj
index 7323f84..8579e94 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b79418.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80043/b80043.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80043/b80043.ilproj
index ba39ef6..ab28114 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80043/b80043.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80043/b80043.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b80043.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj
index 82b38c9..9c611c4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b80045.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.ilproj
index 3847ff1..20deb6a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b80824.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81938/b81938.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81938/b81938.ilproj
index 2ca6c26..045d987 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81938/b81938.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81938/b81938.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b81938.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.ilproj
index 6c5f04e..6b930da 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b82160.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.ilproj
index e1a44e4..a922077 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b82247.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.ilproj
index a629e58..10c9204 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b82249.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.ilproj
index eb64659..e5384c1 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b82715.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj
index b3d913a..299bd8f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b82866.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj
index f4756dd..f667be6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b83690.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj
index 33f5857..ed4f41a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b84836.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.ilproj
index d2bce1c..b6c36b8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84909.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.ilproj
index c812c40..44f9ebe 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84916.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.ilproj
index b0e7533..da84026 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84971.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.ilproj
index 9341076..d582740 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b85316.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj
index 22c51a1..d63ff96 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b91377.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b101147/b101147.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b101147/b101147.ilproj
index 87ddf33..36ef1f6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b101147/b101147.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b101147/b101147.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b101147.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.ilproj
index a361d43..c2f4336 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b85477.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.ilproj
index de5fc1b..71ca284 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b86139.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj
index eafb9fa..914f2af 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b87284.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj
index 76a3643..9e2c476 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b88712.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
index db82e9d..be2f56d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b88793.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj
index 536062d..9bb4ab4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b88797.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj
index 47b8685..539e32c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b89277.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj
index 9679944..7bfbefb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b89279.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.ilproj
index cdc8f74..aa76853 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b89409.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj
index bb9c134..eba4db5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b89506.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.ilproj
index 58879b0..f6d799d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b89546.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj
index e321086..379646c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b89600.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj
index c27293d..d0914f8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b89946.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b90129/b90129.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b90129/b90129.ilproj
index 0e9a51b..b2801bc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b90129/b90129.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b90129/b90129.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b90129.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.ilproj
index 1c0fba9..8a1a352 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b91021.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj
index 580531b..470cb1f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b91189.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.ilproj
index debeb24..5950c1d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b91203.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.ilproj
index c908e42..9c09bec 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b91223.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj
index 4c5c007..045536e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b91230.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
index 89280ee..7fc986b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b91248.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.ilproj
index 590605d..6aad7e6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b91359.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj
index 6da6922..6b5f257 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b91855.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj
index 6bd4803..ff406a8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b91859.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj
index 686846a..eb09e6c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b91867.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj
index 90f05a7..33537c3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b91917.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj
index 6ca3749..0c81386 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b92568.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj
index 05c8df1..2fcc87a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b92614.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj
index bceb45d..2cef946 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b92693.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.ilproj
index 5a75e83..bb12b2c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b92736.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj
index 32ca038..b365079 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b93027.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.ilproj
index f1451f0..3bde951 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b94306.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99667/b99667.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99667/b99667.ilproj
index cbdaaa2..67e8a4f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99667/b99667.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99667/b99667.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b99667.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj
index caa2fb8..620a7f5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b119538a.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj
index b9bf54a..4e6bcbf 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b119538b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147814/b147814_il.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147814/b147814_il.ilproj
index ac32993..9f8bef3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147814/b147814_il.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147814/b147814_il.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rembug.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147816/b147816.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147816/b147816.ilproj
index 1871a2c..c23b1c4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147816/b147816.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147816/b147816.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="loop.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj
index 687e06c..442d8a3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="testclass.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.ilproj
index c7a1a81..69402bf 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="params-mixed.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.ilproj
index 0de173d..99f484c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="params-none.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.ilproj
index 04fb3ec..3161de3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="params-object.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.ilproj
index 2ee9d47..c75169a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="params-value.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.ilproj
index 9201e52..5a7e033 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="params-varargs.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.ilproj
index 52ed6f5..39c0b78 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="static-mixed.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.ilproj
index 5a655ac..15929b4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="static-object.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj
index ffa0fbe..fcdc6d5 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b119294.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj
index b3a08cd..aaf7b29 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="byteshift.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.ilproj
index 547a931..7652539 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b139895.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.ilproj
index 663a8c7..5b23231 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b140118.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj
index 9a95ffc..515a5c3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b140711.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj
index 1277423..115e2f2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="dblinf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj
index 9fc1f83..fd274ee 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="genisinst.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147147/b147147.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147147/b147147.ilproj
index d2bf6f0..91dbd6e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147147/b147147.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147147/b147147.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="samabo.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147924/b147924.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147924/b147924.ilproj
index fc6b228..060cdae 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147924/b147924.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147924/b147924.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bigdat.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj
index ccfd056..73bb18d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b169333.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj
index c8122ee..ef97357 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="hugemthfrm.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj
index b8d671f..43932dc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="hugestruct.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj
index 8dba510..1ff018e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="constrained1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381b.ilproj
index c02462a..1ba4c78 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="constrained2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj
index 9906003..d3a7b56 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="ParamLimit.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj
index 3f3e924..80bbbaa 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct01_gen.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/b220968.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/b220968.ilproj
index 7b8e0cd..4b4748b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/b220968.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/b220968.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/b223924.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/b223924.ilproj
index 8fd9f19..c67234a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/b223924.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/b223924.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/b223932.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/b223932.ilproj
index 08b1959..a99b6f0 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/b223932.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/b223932.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug3.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/b223936.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/b223936.ilproj
index f700b4c..b640928 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/b223936.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/b223936.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.ilproj
index cfa871b..24cc385 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b00722.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj
index e0095e8..61d6c98 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b00735.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj
index aa2f2ad..f64d76e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b02345.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.ilproj
index 7a1dd6f..2ed0f21 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b04319.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/b05623.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/b05623.ilproj
index 5c3bad1..6f23128 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/b05623.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/b05623.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b05623.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b06020/b06020.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b06020/b06020.ilproj
index 46cf635..c9b4517 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b06020/b06020.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b06020/b06020.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b06020.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj
index b3a08cd..aaf7b29 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="byteshift.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07369/b07369.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07369/b07369.ilproj
index 41c91a9..cc66a1e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07369/b07369.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07369/b07369.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b07369.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.ilproj
index c16e618..83d7347 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b07383.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj
index 78ab551..b232f5c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="rpPasses.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07947/b07947.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07947/b07947.ilproj
index 2e6762f..edebfb3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07947/b07947.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07947/b07947.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b07947.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj
index 40b23b5..c0acd38 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="bbHndIndex.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj
index 770ae12..f0ced6e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b11762.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.ilproj
index 9e4e3d3..200f79d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b13452.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.ilproj
index 828b839..fdbcf27 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b14617.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b15617/b15617.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b15617/b15617.ilproj
index 2bfc607..797ce36 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b15617/b15617.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b15617/b15617.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="arrayDim.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj
index c2e37b4..9e8057f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="gtnop.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj
index 0b1b0e4..f2b83f2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="gtIsValid64RsltMul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b18049/b18049.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b18049/b18049.ilproj
index 59c1858..6acda71 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b18049/b18049.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b18049/b18049.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="loop2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962a.ilproj
index c9da998..352a569 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="t.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962b.ilproj
index abc7ce3..971c086 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="t2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962c.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962c.ilproj
index 9bda7e3..0745d5a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962c.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962c.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="vc178279.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932a.ilproj
index c9da998..352a569 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932a.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="t.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932b.ilproj
index 4cefd38..90275f3 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932b.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="t1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b118260/b118260.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b118260/b118260.ilproj
index 82d5214..0264fa4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b118260/b118260.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b118260/b118260.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b118260.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b138117/b138117.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b138117/b138117.ilproj
index bdb10b2..4c235fb 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b138117/b138117.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b138117/b138117.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldsfldainitonlyvt.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj
index 2797f29..75be0ae 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="jmp2blk.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj
index 35288da..e5c9ca2 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b578931.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/b091942.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/b091942.ilproj
index 6108da4..4423384 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/b091942.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/b091942.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="nullref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj
index f583fd9..381cb40 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="DeadBlock.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj
index 74bc7e1..f1f35a6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="vars2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/b309555.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/b309555.ilproj
index 5157b79..aba82bf 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/b309555.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/b309555.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="x86-test-1084346006.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj
index abc477e..bec8a58 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="1086745236.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj
index c30525e..283f708 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="repro.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-dbg.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-dbg.ilproj
index 73b674a..4a8d12e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-dbg.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="1087985874.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-ret.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-ret.ilproj
index a030be6..b9480a7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-ret.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-ret.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="1087985874.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj
index 2bb0826..23adb11 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="vsw338014.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b353858/b353858.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b353858/b353858.ilproj
index e17934b..cd7d07d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b353858/b353858.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b353858/b353858.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b353858.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/b374944.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/b374944.ilproj
index adc1668..769cded 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/b374944.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/b374944.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="helper.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj
index 2947a78..ace1b41 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b405223.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.ilproj
index 505061a..2a31e6e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b409617.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj
index 2eb404d..b7ae0a6 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="b409748.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.ilproj
index d0df5a0..58697da 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b415164.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj
index 726b0b6..85a2e1c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b416667.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/Desktop/b423755.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/Desktop/b423755.ilproj
index 388b8e2..07fc1ce 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/Desktop/b423755.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/Desktop/b423755.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b423755.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj
index 4f6255d..2a43170 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b369916.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.ilproj
index e19b9c8..db0ee3f 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b471305.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b475589/b475589.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b475589/b475589.ilproj
index a155b32..9b9ea26 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b475589/b475589.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b475589/b475589.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b475589.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.ilproj
index c5b4f59..9aed25d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b489329.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b518440/b518440.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b518440/b518440.ilproj
index 18f52af..62024cd 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b518440/b518440.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b518440/b518440.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b518440.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.ilproj
index 60fa807..005d45c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.ilproj
index 2513a32..d232c93 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj
index 3a36ec8..e1f118d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b392262.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj
index 64af208..b3346af 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b400971.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj
index f70b7e6..d2b0788 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b402658.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.ilproj
index 3894018..0671ac7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b464149.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj
index 28592b0..59c77e7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="DevDiv_376412.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.ilproj
index 8a954c0..7c88a7c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="LdfldaHack.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj
index cd9f882..96f7a81 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ConstToString.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj
index 31e02ad..a85d8ff 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="NullCheckBoxedValuetypeReturn.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj
index 6f47375..1f66c6d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b158861.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj
index 7c3309c..0766bd7 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b163200.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj
index d8aa7c0..dc6f0ef 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b170362.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.ilproj
index 7c6abd5..e34fbfc 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b170362.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/b174294.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/b174294.ilproj
index b8033ee..1fb876d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/b174294.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/b174294.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="spill.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.ilproj
index abf8b9e..62e076a 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b176032.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj
index 776d180..6271253 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b33183.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj
index 7b2ab42..5347442 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b49778.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj
index 48f1e3f..b9c9873 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b106272.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj
index 00c86d5..bd68af4 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b152292.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.ilproj
index 2979a81..065f30b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b173313.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.ilproj
index 7c722c6..a15454e 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="b193264.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b48850/b48850.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b48850/b48850.ilproj
index e6c7863..0e2060d 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b48850/b48850.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b48850/b48850.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b48850.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj
index cf7cd7c..2eff520 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b565808.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj
index cd07952..5224dda 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b589202.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj
index 4582def..eb1d788 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b598034.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj
index 110a576..dcf0685 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b598649.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj
index 3fae043..47f1d4c 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_Vars2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj
index 9791e0a..8aa705b 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b608066.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj
index 002346f..cfcd4da 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b608198.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj
index 5324b49..aed20db 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b609280.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj
index 05fc9ca..b6845a8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b610562.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj
index 61efefc..784f2c8 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b610750.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj
index 4738df7..00e2c28 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="32vs64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj
index 45586ad..e295625 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b611219.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj
index 07cee49..f6d4012 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b72218.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/b429039/b429039.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/b429039/b429039.ilproj
index 63669c6..b3817cf 100644 (file)
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/b429039/b429039.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/b429039/b429039.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b429039.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj b/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj
index ec44d17..232054d 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Dev11_457559.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj
index d683407..4ca3efd 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="Test_HndIndex_10_Plain.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj
index 1737681..7e9b1d3 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="Test_HndIndex_10_Reordered.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj b/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj
index d589f08..489d743 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Dev11_5437.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj b/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj
index bc57d87..e209622 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Dev11_617302.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj b/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj
index ea0a8c4..48c9e35 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Dev11_646049.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj
index 10016e2..fd47673 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b473131.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj
index 864e799..21c57da 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="b473131_byte.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj
index 6c3fdfd..b49adfa 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b473131_fld.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj
index 85ca9b9..93dbaa4 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b473131_intptr.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj
index 2dac122..26c2dd8 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b473131_struct.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj b/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj
index a136307..3c60f0e 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj
+++ b/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv2_10623.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj b/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj
index 0381c9e..9643aaa 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj
+++ b/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="DevDiv2_11321.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj b/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj
index e31c891..04e9aa1 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj
+++ b/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="DevDiv2_8863.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj b/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj
index a6e4e4b..b1250b8 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj
+++ b/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="VectorForwarder.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj b/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj
index 199a76b..13a0a65 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj
+++ b/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="UseUnalignedDouble.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj b/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj
index cbd9172..5fe288d 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="loopvt.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj b/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj
index b3fb91d..8ff30a7 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="dev11_13912.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj b/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj
index 03abb76..67e7cb0 100644 (file)
--- a/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="seqpts.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
index ad64fd5..b7e7faa 100644 (file)
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_876169.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
index d0637dc..b5563c4 100644 (file)
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_876169.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
index ad64fd5..b7e7faa 100644 (file)
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_876169.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
index d0637dc..b5563c4 100644 (file)
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_876169.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj
index 4073d3f..4751810 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_794115.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj
index f409df4..e0c935b 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_794115.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj
index 4073d3f..4751810 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_794115.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj
index f409df4..e0c935b 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_794115.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj
index 32878a9..99e6607 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_794631.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj
index a620d29..734fea1 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_794631.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj
index 32878a9..99e6607 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_794631.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj
index a620d29..734fea1 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_794631.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj
index 4c4948a..d18f502 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_815940.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj
index 141c1ea..4fdab68 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_815940.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj
index 4c4948a..d18f502 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_815940.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj
index 141c1ea..4fdab68 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_815940.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj
index 40fde59..00d9b8d 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_816617.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj
index 4a1634a..403df88 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_816617.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj
index 40fde59..00d9b8d 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_816617.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj
index 4a1634a..403df88 100644 (file)
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DevDiv_816617.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj
index cdf6c44..b744208 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="emptytryfinally.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.ilproj
index 9122902..f7a96e9 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b102759.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.ilproj
index 6c8073e..1636ae1 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b102870.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103838/b103838.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103838/b103838.ilproj
index 672f3c6..62bde8a 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103838/b103838.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103838/b103838.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="c.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj
index 61c5bcf..252c861 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="d.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b106158/b106158.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b106158/b106158.ilproj
index a1dd3d4..383acb1 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b106158/b106158.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b106158/b106158.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="branchoutoftry.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108366/b108366.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108366/b108366.ilproj
index 54a1a76..53431bd 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108366/b108366.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108366/b108366.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.ilproj
index 6cebb4e..7fb66d8 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b108908.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109721/b109721.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109721/b109721.ilproj
index 54a1a76..53431bd 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109721/b109721.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109721/b109721.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878.ilproj
index 59f7fd7..99fabad 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rem_r4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj
index 52c0ba7..e86adf2 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +32,15 @@
     <Compile Include="makework.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112982/b112982.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112982/b112982.ilproj
index b3d4bde..5d6f844 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112982/b112982.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112982/b112982.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="exceptobj.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113286/b113286.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113286/b113286.ilproj
index 7135ada..070a56c 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113286/b113286.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113286/b113286.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b114628/b114628.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b114628/b114628.ilproj
index 7135ada..070a56c 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b114628/b114628.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b114628/b114628.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="array.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.ilproj
index 36f3c00..7f90599 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b115103.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj
index 6a4ad53..ad057a5 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="hello2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj
index d51e3b8..248e1ea 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="bug.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj
index 82e165b..2baf7dc 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="charbug.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj
index 0e53da5..0ef7feb 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141062/b141062.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141062/b141062.ilproj
index d64ba66..45b0082 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141062/b141062.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141062/b141062.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ericswitch.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj
index 0e53da5..0ef7feb 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.ilproj
index 1125900..095319e 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b79852.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.ilproj
index 810f9a3..101c4cf 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b79858.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365.ilproj
index 113b666..e8fa2dd 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b80365-ia64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.ilproj
index 56255ea..f10a0a8 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b80373.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80737/b80737.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80737/b80737.ilproj
index d04a1fb..6cf60f2 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80737/b80737.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80737/b80737.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fbug5.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80738/b80738.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80738/b80738.ilproj
index 5a91394..b727273 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80738/b80738.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80738/b80738.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="fbug6.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81763/b81763.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81763/b81763.ilproj
index 49818fe..2c03034 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81763/b81763.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81763/b81763.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b81763.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81764/b81764.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81764/b81764.ilproj
index 1134a87..e08db79 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81764/b81764.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81764/b81764.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b81764.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.ilproj
index 936db5b..170b994 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b81766.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.ilproj
index 2b27647..4a72f18 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84129.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.ilproj
index e5ed21c..d12a91e 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84131.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.ilproj
index 226d09b..68cd859 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84136.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.ilproj
index 2c0714c..2782db5 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84586.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.ilproj
index aa8afb9..f5c672c 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84590.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.ilproj
index 9bf610c..4c62a82 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84592.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.ilproj
index 2331ab2..831dd50 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84957.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.ilproj
index 0856301..167f0f9 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84958.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.ilproj
index 3039c06..fac6ef9 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84961.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.ilproj
index 258a2eb..6fbdfe2 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b84962.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.ilproj
index 2eb74a5..85e55c4 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b85314.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.ilproj
index 3821131..579856c 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b85315.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85316/b85316.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85316/b85316.ilproj
index c03438b..9c0095b 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85316/b85316.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85316/b85316.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="f2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.ilproj
index 6bf3ce7..44081d2 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b85317.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.ilproj
index 3dee6af..c5d1da8 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b85564.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.ilproj
index b43e0de..c55197d 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b85565.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.ilproj
index 58d9a82..0bf7c02 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b85566.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.ilproj
index d219ef8..f24fd11 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b92713.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.ilproj
index 122493c..a7e7c70 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b92726.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj
index 9f03f82..e56f195 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b99219.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj
index 82aa51f..95a0f72 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj
index bd28c3a..fcbd726 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="structret1_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj
index 33caa82..ebe97f3 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct5_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj
index 6b459bb..a1aea1e 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="ericcprop3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/b223862.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/b223862.ilproj
index 0b946ab..d4db165 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/b223862.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/b223862.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj
index a62f908..9b463a8 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="pack8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/b91953.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/b91953.ilproj
index 22aff5a..fb32793 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/b91953.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/b91953.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj
index 4cabb77..9505739 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="switch.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj
index df79897..3bbbb4c 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="locals10K.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/b10802.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/b10802.ilproj
index a0e5784..3fd5db0 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/b10802.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/b10802.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="repro.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj
index 84f305f..d972d65 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="MT_DEATH.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/b10841.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/b10841.ilproj
index 5b7f807..e2c69a2 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/b10841.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/b10841.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="repro_good.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/b11131.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/b11131.ilproj
index 8fd9f19..c67234a 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/b11131.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/b11131.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/b11878.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/b11878.ilproj
index 0c880c3..9fad0b1 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/b11878.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/b11878.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_07.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/b12022.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/b12022.ilproj
index 7a72b9e..bc64687 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/b12022.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/b12022.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_10.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/b12263.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/b12263.ilproj
index 6108da4..4423384 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/b12263.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/b12263.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="nullref.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/b12343.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/b12343.ilproj
index 2fa07e6..0fae837 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/b12343.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/b12343.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_04a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/b12390.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/b12390.ilproj
index 2fa07e6..0fae837 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/b12390.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/b12390.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_04a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/b12425.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/b12425.ilproj
index 6e158e3..2528c7e 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/b12425.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/b12425.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_17.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/b13691.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/b13691.ilproj
index 10ae4a4..1361030 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/b13691.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/b13691.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="init_byte.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj
index af35217..17741dc 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="divbyte.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj
index 3fb78a2..fdf3c93 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="divshort.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/b102518.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/b102518.ilproj
index 71a7cba..1683693 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/b102518.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/b102518.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="hole.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj
index 68605c4..8c21316 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b102729.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj
index 3b6b93c..692c55d 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="gcparamonstack.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/b102844.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/b102844.ilproj
index 3c072a3..d0d20e3 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/b102844.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/b102844.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="tailcallcalli.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj
index ac45711..4b2529c 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="ovf.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj
index 9d6b63f..a4226e4 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="redundant.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/b14366.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/b14366.ilproj
index 8fd9f19..c67234a 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/b14366.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/b14366.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14368/b14368.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14368/b14368.ilproj
index f700b4c..b640928 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14368/b14368.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14368/b14368.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/b14369.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/b14369.ilproj
index e3840ab..9c6f289 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/b14369.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/b14369.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug5.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16198/b16198.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16198/b16198.ilproj
index e9c72b9..57e2713 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16198/b16198.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16198/b16198.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="decm010.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/b16224.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/b16224.ilproj
index 7ec98ac..928bdb5 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/b16224.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/b16224.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test_25.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/b17023.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/b17023.ilproj
index 58439e4..8a47968 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/b17023.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/b17023.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test1a.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/b17751.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/b17751.ilproj
index f700b4c..b640928 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/b17751.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/b17751.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug4.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/b17904.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/b17904.ilproj
index 60fa807..005d45c 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/b17904.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/b17904.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj
index b65d051..5617eb6 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="stringArray114.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj
index 0e53da5..0ef7feb 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/b22521.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/b22521.ilproj
index 6b07507..75fed65 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/b22521.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/b22521.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="branch_06.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/b22680.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/b22680.ilproj
index 7b8e0cd..4b4748b 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/b22680.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/b22680.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj
index 719262b..57b4c00 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="_1d6bgof.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj
index bdf03f2..a72c12d 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="gcparaminreg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj
index 4d62e60..64b02b1 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj
index 33caa82..ebe97f3 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="struct5_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj
index bd28c3a..fcbd726 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="structret1_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158.ilproj
index 60fa807..005d45c 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158_64.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158_64.ilproj
index d88687b..5ffdcd0 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158_64.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158_64.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test64.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj
index 1905d09..8c4ee2b 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="test.hfa12.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/b29727.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/b29727.ilproj
index 22aff5a..fb32793 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/b29727.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/b29727.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj
index 7d6bbf6..997e421 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b184799.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj
index ef58004..d1f3010 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="_aopst1l.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj
index 500cdf3..6ed6e98 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="_ba6c0ou.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj
index 9ce1745..38f35f0 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="_hngh669.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/b309576.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/b309576.ilproj
index 8fd9f19..c67234a 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/b309576.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/b309576.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bug2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
index ec65709..f150d3a 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="b311420.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.ilproj
index 21dd0c3..3362562 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b333008.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.ilproj
index ee2ca2d..9d6fd67 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b356258.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj
index c30525e..283f708 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="repro.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.ilproj
index 47291df..8d52ff0 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b431098.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b450688/b450688.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b450688/b450688.ilproj
index 20045b8..965cc59 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b450688/b450688.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b450688/b450688.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b450688.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.ilproj
index 5929869..ecf8050 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b460385.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj
index a093ca2..5846b63 100644 (file)
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="b539509.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj b/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj
index 56a74c8..4fe2779 100644 (file)
--- a/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj
+++ b/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b173569.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj
index efc6616..e446015 100644 (file)
--- a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj
+++ b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="overRepLocalOpt.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.ilproj b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.ilproj
index 0f0a9df..98a3641 100644 (file)
--- a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.ilproj
+++ b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="b602182.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/Regression/v4/dev10_804810/dev10_804810.ilproj b/tests/src/JIT/Regression/v4/dev10_804810/dev10_804810.ilproj
index f0f069b..4f75835 100644 (file)
--- a/tests/src/JIT/Regression/v4/dev10_804810/dev10_804810.ilproj
+++ b/tests/src/JIT/Regression/v4/dev10_804810/dev10_804810.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="dev10_804810.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/config/empty.packages.config b/tests/src/JIT/config/empty.packages.config
deleted file mode 100644 (file)
index 79ece06..0000000
--- a/tests/src/JIT/config/empty.packages.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-</packages>

diff --git a/tests/src/JIT/config/empty/project.json b/tests/src/JIT/config/empty/project.json
new file mode 100644 (file)
index 0000000..23102a9
--- /dev/null
+++ b/tests/src/JIT/config/empty/project.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+  },
+  "frameworks": {
+  }
+}
\ No newline at end of file

diff --git a/tests/src/JIT/config/empty/project.lock.json b/tests/src/JIT/config/empty/project.lock.json
new file mode 100644 (file)
index 0000000..88d9835
--- /dev/null
+++ b/tests/src/JIT/config/empty/project.lock.json
@@ -0,0 +1,11 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    "": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/JIT/config/minimal.packages.config b/tests/src/JIT/config/minimal.packages.config
deleted file mode 100644 (file)
index c5ec75f..0000000
--- a/tests/src/JIT/config/minimal.packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-    <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-</packages>

diff --git a/tests/src/JIT/config/minimal/project.json b/tests/src/JIT/config/minimal/project.json
new file mode 100644 (file)
index 0000000..7fad5ff
--- /dev/null
+++ b/tests/src/JIT/config/minimal/project.json
@@ -0,0 +1,10 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/JIT/config/minimal/project.lock.json b/tests/src/JIT/config/minimal/project.lock.json
new file mode 100644 (file)
index 0000000..b2c00b9
--- /dev/null
+++ b/tests/src/JIT/config/minimal/project.lock.json
@@ -0,0 +1,612 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "uoRg44bzPk9KE9Sg6rLZmGfUmFZBDc7y25692VYna/WW3Smip/aGX0ESXyuNvWA8k8oXdV4Z/M4ZKdB3ahtdDw==",
+      "files": [
+        "System.Threading.4.0.10-beta-23024.nupkg",
+        "System.Threading.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/DNXCore50/System.Threading.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.dll",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/JIT/config/threading+thread.packages.config b/tests/src/JIT/config/threading+thread.packages.config
deleted file mode 100644 (file)
index 1ab5555..0000000
--- a/tests/src/JIT/config/threading+thread.packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-    <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-    <package id="System.Threading" version="4.0.0-beta-22412" />
-    <package id="System.Threading.Thread" version="4.0.0-beta-22512" />
-</packages>

diff --git a/tests/src/JIT/config/threading+thread/project.json b/tests/src/JIT/config/threading+thread/project.json
new file mode 100644 (file)
index 0000000..212fd73
--- /dev/null
+++ b/tests/src/JIT/config/threading+thread/project.json
@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+    "System.Threading.Thread": "4.0.0-beta-*",
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/JIT/config/threading+thread/project.lock.json b/tests/src/JIT/config/threading+thread/project.lock.json
new file mode 100644 (file)
index 0000000..b542774
--- /dev/null
+++ b/tests/src/JIT/config/threading+thread/project.lock.json
@@ -0,0 +1,654 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Thread/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Thread.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Thread.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Thread/4.0.0-beta-23024": {
+      "sha512": "aeok537DgipEVRaoFjfYFf5MAyKm6eXKQQibvvHDertRXx+h1a7sIxt+K9QEHbjxDeKC+06orbGMlasNPSLxHA==",
+      "files": [
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg",
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Thread.nuspec",
+        "lib/DNXCore50/System.Threading.Thread.dll",
+        "lib/net46/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.xml",
+        "ref/dotnet/de/System.Threading.Thread.xml",
+        "ref/dotnet/es/System.Threading.Thread.xml",
+        "ref/dotnet/fr/System.Threading.Thread.xml",
+        "ref/dotnet/it/System.Threading.Thread.xml",
+        "ref/dotnet/ja/System.Threading.Thread.xml",
+        "ref/dotnet/ko/System.Threading.Thread.xml",
+        "ref/dotnet/ru/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hans/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hant/System.Threading.Thread.xml",
+        "ref/net46/System.Threading.Thread.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Threading >= 4.0.0-beta-*",
+      "System.Threading.Thread >= 4.0.0-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/JIT/config/threading.packages.config b/tests/src/JIT/config/threading.packages.config
deleted file mode 100644 (file)
index 8ac5fad..0000000
--- a/tests/src/JIT/config/threading.packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-    <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-    <package id="System.Threading" version="4.0.0-beta-22412" />
-</packages>

diff --git a/tests/src/JIT/config/threading/project.json b/tests/src/JIT/config/threading/project.json
new file mode 100644 (file)
index 0000000..d3674ba
--- /dev/null
+++ b/tests/src/JIT/config/threading/project.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/JIT/config/threading/project.lock.json b/tests/src/JIT/config/threading/project.lock.json
new file mode 100644 (file)
index 0000000..958d3e3
--- /dev/null
+++ b/tests/src/JIT/config/threading/project.lock.json
@@ -0,0 +1,620 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Threading >= 4.0.0-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/JIT/dir.props b/tests/src/JIT/dir.props
index e8607c9..20c71a9 100644 (file)
--- a/tests/src/JIT/dir.props
+++ b/tests/src/JIT/dir.props
@@ -1,11 +1,6 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dir.props" />
 
-  <!-- Disable some C# warnings for the JIT tests. -->
-  <PropertyGroup>
-    <NoWarn>78,162,164,168,169,219,251,252,414,429,642,649,652,675,1691,1717,1718</NoWarn>
-  </PropertyGroup>
-
   <PropertyGroup>
     <JitPackagesConfigFileDirectory>$(MSBuildThisFileDirectory)config\</JitPackagesConfigFileDirectory>
   </PropertyGroup>

diff --git a/tests/src/JIT/dir.targets b/tests/src/JIT/dir.targets
deleted file mode 100644 (file)
index e4603ae..0000000
--- a/tests/src/JIT/dir.targets
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- 
-  There is a bug in the targets files we pull in from BuildTools which resets PackagesConfigFile if "PackageConfigFile" is unset.
-
-  Since we use PacakgesConfigFile in order to share packages.config files across the Jit test bed (to speed up package restore)
-  we need to work around this issue.
-  -->
-  <PropertyGroup>
-    <PackageConfigFile Condition="'$(PackagesConfigFile)' != ''">$(PackagesConfigFile)</PackageConfigFile>
-  </PropertyGroup>
-       
-  <Import Project="..\dir.targets" />
-</Project>

diff --git a/tests/src/JIT/jit64/gc/misc/148343.csproj b/tests/src/JIT/jit64/gc/misc/148343.csproj
index 0c5e4ec..2b05d9f 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/148343.csproj
+++ b/tests/src/JIT/jit64/gc/misc/148343.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="148343.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj b/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj
index c6aa067..7682181 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="9_and_alloca2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/9param.csproj b/tests/src/JIT/jit64/gc/misc/9param.csproj
index 0688826..43d5169 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/9param.csproj
+++ b/tests/src/JIT/jit64/gc/misc/9param.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="9param.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/eh1.csproj b/tests/src/JIT/jit64/gc/misc/eh1.csproj
index 09f8322..3c9e7f6 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/eh1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/eh1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="eh1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/fgtest1.csproj b/tests/src/JIT/jit64/gc/misc/fgtest1.csproj
index 9ae128a..92a1415 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/fgtest1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/fgtest1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="fgtest1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/fgtest2.csproj b/tests/src/JIT/jit64/gc/misc/fgtest2.csproj
index 03516bc..3acad7c 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/fgtest2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/fgtest2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="fgtest2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/funclet.csproj b/tests/src/JIT/jit64/gc/misc/funclet.csproj
index aee9a6b..23f53ea 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/funclet.csproj
+++ b/tests/src/JIT/jit64/gc/misc/funclet.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="funclet.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj b/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj
index 7f9c54e..4e73cb6 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj
+++ b/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="gcparaminreg.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj b/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj
index 6400b8f..c6231c8 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ret_struct_test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj b/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj
index b42a496..6ff31a7 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ret_struct_test4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/simple1.csproj b/tests/src/JIT/jit64/gc/misc/simple1.csproj
index adf883b..68611d5 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/simple1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/simple1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="simple1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct1.csproj b/tests/src/JIT/jit64/gc/misc/struct1.csproj
index 7f9d8f3..5e5fc42 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct1_2.csproj b/tests/src/JIT/jit64/gc/misc/struct1_2.csproj
index 50a5e02..2b7df3d 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct1_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct1_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct1_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct1_4.csproj b/tests/src/JIT/jit64/gc/misc/struct1_4.csproj
index dfd9304..6e2396d 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct1_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct1_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct1_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct1_5.csproj b/tests/src/JIT/jit64/gc/misc/struct1_5.csproj
index 129c382..f7e0e7b 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct1_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct1_5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct1_5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct2.csproj b/tests/src/JIT/jit64/gc/misc/struct2.csproj
index 6608e6b..ddb8fdf 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct2_2.csproj b/tests/src/JIT/jit64/gc/misc/struct2_2.csproj
index 2bf7b06..4df1e63 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct2_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct2_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct2_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct2_4.csproj b/tests/src/JIT/jit64/gc/misc/struct2_4.csproj
index 6e866f3..9c89b8a 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct2_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct2_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct2_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct2_5.csproj b/tests/src/JIT/jit64/gc/misc/struct2_5.csproj
index 7ff1f8c..059b292 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct2_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct2_5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct2_5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj b/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj
index 3d25f74..d68f068 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct2_5_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct3.csproj b/tests/src/JIT/jit64/gc/misc/struct3.csproj
index 3dccb8c..15d8d2f 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct3_2.csproj b/tests/src/JIT/jit64/gc/misc/struct3_2.csproj
index 4aedd70..d229634 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct3_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct3_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct3_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct3_4.csproj b/tests/src/JIT/jit64/gc/misc/struct3_4.csproj
index 7a0e32b..63d5747 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct3_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct3_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct3_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct3_5.csproj b/tests/src/JIT/jit64/gc/misc/struct3_5.csproj
index 58ef78e..4e8e5d5 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct3_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct3_5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct3_5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct4.csproj b/tests/src/JIT/jit64/gc/misc/struct4.csproj
index 74a3c77..2cc17c7 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct4_2.csproj b/tests/src/JIT/jit64/gc/misc/struct4_2.csproj
index debecb1..9218fec 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct4_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct4_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct4_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct4_4.csproj b/tests/src/JIT/jit64/gc/misc/struct4_4.csproj
index 3197419..bc9aef3 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct4_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct4_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct4_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct4_5.csproj b/tests/src/JIT/jit64/gc/misc/struct4_5.csproj
index 18bb353..e302e3c 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct4_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct4_5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct4_5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct5.csproj b/tests/src/JIT/jit64/gc/misc/struct5.csproj
index 414f60c..a0ce383 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct5_2.csproj b/tests/src/JIT/jit64/gc/misc/struct5_2.csproj
index 0fe332a..11dc3b5 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct5_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct5_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct5_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct5_4.csproj b/tests/src/JIT/jit64/gc/misc/struct5_4.csproj
index 48ac998..5991106 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct5_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct5_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct5_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct5_5.csproj b/tests/src/JIT/jit64/gc/misc/struct5_5.csproj
index c4c9a5f..c9db4b0 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct5_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct5_5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct5_5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct6.csproj b/tests/src/JIT/jit64/gc/misc/struct6.csproj
index bad69ad..ad599f5 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct6.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct6.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct6.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct6_2.csproj b/tests/src/JIT/jit64/gc/misc/struct6_2.csproj
index 2ada6da..4e6618f 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct6_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct6_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct6_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct6_4.csproj b/tests/src/JIT/jit64/gc/misc/struct6_4.csproj
index 50231f4..1b16dd8 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct6_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct6_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct6_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct6_5.csproj b/tests/src/JIT/jit64/gc/misc/struct6_5.csproj
index 5b89890..4d20c76 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct6_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct6_5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct6_5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct7_1.csproj b/tests/src/JIT/jit64/gc/misc/struct7_1.csproj
index a598e20..d80542b 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct7_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct7_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct7_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct8.csproj b/tests/src/JIT/jit64/gc/misc/struct8.csproj
index f90e30f..1271657 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct8.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct8.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct8.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct9.csproj b/tests/src/JIT/jit64/gc/misc/struct9.csproj
index 52d1e73..465e05d 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct9.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct9.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct9.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/struct9_2.csproj b/tests/src/JIT/jit64/gc/misc/struct9_2.csproj
index 4f8c575..31c1250 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/struct9_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct9_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="struct9_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj
index 26d4dc9..fb1d60e 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp1_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj
index 87706be..c2d9671 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp1_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj
index 0f4c85e..ac8c985 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp1_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj
index 93702bc..e9c93ee 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp1_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj
index feffb7e..4e9ef9e 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp1_5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj
index d286b0e..fcecc68 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp1_6.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj
index da396cf..75db710 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp2_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj b/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj
index ed71e41..d7fe60a 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp2_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj b/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj
index 5d89cc0..aa57b10 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp2_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj b/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj
index 7ea7282..3409344 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp2_4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj
index 30b6970..1bb9b92 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp3_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj
index 13178bc..92be834 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp4_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj
index d84a031..1ea3c11 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp5_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj
index 8682111..862487f 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structfp6_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj b/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj
index be4411f..4f28f59 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
@@ -35,14 +35,15 @@
     <Compile Include="structfpseh5_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj b/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj
index cce276c..0bf1fc8 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,14 +35,15 @@
     <Compile Include="structfpseh6_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structref1_1.csproj b/tests/src/JIT/jit64/gc/misc/structref1_1.csproj
index aa414c8..d517ba0 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structref1_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structref1_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structref1_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret1_1.csproj b/tests/src/JIT/jit64/gc/misc/structret1_1.csproj
index c0304e0..e4b45bd 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret1_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret1_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret1_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret1_2.csproj b/tests/src/JIT/jit64/gc/misc/structret1_2.csproj
index fd2aef6..8198934 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret1_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret1_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret1_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret1_3.csproj b/tests/src/JIT/jit64/gc/misc/structret1_3.csproj
index 42a03ca..22b59ad 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret1_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret1_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret1_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret2_1.csproj b/tests/src/JIT/jit64/gc/misc/structret2_1.csproj
index 2bedb9f..950c3ed 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret2_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret2_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret2_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret2_2.csproj b/tests/src/JIT/jit64/gc/misc/structret2_2.csproj
index c7ee119..d6b8657 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret2_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret2_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret2_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret2_3.csproj b/tests/src/JIT/jit64/gc/misc/structret2_3.csproj
index 664e66c..bc46564 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret2_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret2_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret2_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret3_1.csproj b/tests/src/JIT/jit64/gc/misc/structret3_1.csproj
index d616708..260b0a4 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret3_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret3_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret3_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret3_2.csproj b/tests/src/JIT/jit64/gc/misc/structret3_2.csproj
index 2ef1a52..dc86e98 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret3_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret3_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret3_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret3_3.csproj b/tests/src/JIT/jit64/gc/misc/structret3_3.csproj
index 6b23951..213ce47 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret3_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret3_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret3_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret4_1.csproj b/tests/src/JIT/jit64/gc/misc/structret4_1.csproj
index aac749e..3162739 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret4_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret4_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret4_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret4_2.csproj b/tests/src/JIT/jit64/gc/misc/structret4_2.csproj
index 10cd89d..1cb2c0b 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret4_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret4_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret4_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret4_3.csproj b/tests/src/JIT/jit64/gc/misc/structret4_3.csproj
index 563d58b..644dcb3 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret4_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret4_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret4_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret5_1.csproj b/tests/src/JIT/jit64/gc/misc/structret5_1.csproj
index 236b380..4e4f083 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret5_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret5_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret5_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret5_2.csproj b/tests/src/JIT/jit64/gc/misc/structret5_2.csproj
index 6069472..c031f6d 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret5_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret5_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret5_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret5_3.csproj b/tests/src/JIT/jit64/gc/misc/structret5_3.csproj
index 3c8c587..f82e919 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret5_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret5_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret5_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret6_1.csproj b/tests/src/JIT/jit64/gc/misc/structret6_1.csproj
index 3950ecb..786a9ba 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret6_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret6_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret6_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret6_2.csproj b/tests/src/JIT/jit64/gc/misc/structret6_2.csproj
index 4b36dd9..3d3f42e 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret6_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret6_2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret6_2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structret6_3.csproj b/tests/src/JIT/jit64/gc/misc/structret6_3.csproj
index 5984863..2679ddc 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structret6_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret6_3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structret6_3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/structva1_1.csproj b/tests/src/JIT/jit64/gc/misc/structva1_1.csproj
index 3cfb87b..8e483b4 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/structva1_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structva1_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="structva1_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/test1.csproj b/tests/src/JIT/jit64/gc/misc/test1.csproj
index 57a90d0..e30ae66 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/test1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/test1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/test2.csproj b/tests/src/JIT/jit64/gc/misc/test2.csproj
index 0b2ff8e..ada49e3 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/test2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/test2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/test3.csproj b/tests/src/JIT/jit64/gc/misc/test3.csproj
index d80e2e6..4ebaf0e 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/test3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/test3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj b/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj
index 179a475..fafb6e0 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj
+++ b/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test_noalloca.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/misc/vbil.csproj b/tests/src/JIT/jit64/gc/misc/vbil.csproj
index 93b2955..03eec46 100644 (file)
--- a/tests/src/JIT/jit64/gc/misc/vbil.csproj
+++ b/tests/src/JIT/jit64/gc/misc/vbil.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="vbil.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj b/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj
index 932b7e0..004dd92 100644 (file)
--- a/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj
+++ b/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="143837.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj b/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj
index dbc091d..14c1376 100644 (file)
--- a/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj
+++ b/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="339415.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj b/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj
index 9921078..658477b 100644 (file)
--- a/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="zeroInit01_small.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/localloc/zeroinit/zeroinit01_large.ilproj b/tests/src/JIT/jit64/localloc/zeroinit/zeroinit01_large.ilproj
index cb32d27..29ba173 100644 (file)
--- a/tests/src/JIT/jit64/localloc/zeroinit/zeroinit01_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/zeroinit/zeroinit01_large.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="zeroinit01_large.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj
index e5fce4d..683db7e 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseAAA.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj
index 46f582d..b8dc6bf 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseAAA.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj
index e5fce4d..683db7e 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseAAA.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj
index 46f582d..b8dc6bf 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseAAA.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj
index 74f4491..68eb5ac 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseAAC.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj
index c6c238b..2596928 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseAAC.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj
index 74f4491..68eb5ac 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseAAC.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj
index c6c238b..2596928 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseAAC.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj
index 1f8ded6..a9f3354 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseACA.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj
index 97b082c..561ae8a 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseACA.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj
index 1f8ded6..a9f3354 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseACA.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj
index 97b082c..561ae8a 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseACA.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj
index cca37f0..ad8ecab 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseACC.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj
index 6e6bf2a..45fedd7 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseACC.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj
index cca37f0..ad8ecab 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseACC.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj
index 6e6bf2a..45fedd7 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CGRecurseACC.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
index a701cb0..8107a10 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj
index a57b6ce..ff6997b 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
index a701cb0..8107a10 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj
index a57b6ce..ff6997b 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj
index ff10994..af04712 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj
index e87c907..a1266bb 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj
index ff10994..af04712 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj
index e87c907..a1266bb 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj
index 5e2ba33..73ddb38 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj
index 8d6a961..e638f8c 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj
index 5e2ba33..73ddb38 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj
index 8d6a961..e638f8c 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="CgStress3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cg/il/jmp_dbg.ilproj b/tests/src/JIT/jit64/opt/cg/il/jmp_dbg.ilproj
index 3d5bab2..e657be5 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/il/jmp_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/jmp_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jmp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cg/il/jmp_impl.ilproj b/tests/src/JIT/jit64/opt/cg/il/jmp_impl.ilproj
index 4a937a7..4ce775b 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/il/jmp_impl.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/jmp_impl.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="jmp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cg/il/jmp_opt.ilproj b/tests/src/JIT/jit64/opt/cg/il/jmp_opt.ilproj
index 4a937a7..4ce775b 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/il/jmp_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/jmp_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="jmp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cg/il/jmp_ret.ilproj b/tests/src/JIT/jit64/opt/cg/il/jmp_ret.ilproj
index 6a7ba05..cf0064e 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/il/jmp_ret.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/jmp_ret.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="jmp.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cg/il/ldftn_dbg.ilproj b/tests/src/JIT/jit64/opt/cg/il/ldftn_dbg.ilproj
index 3196c61..afbeda0 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/il/ldftn_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/ldftn_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldftn.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cg/il/ldftn_impl.ilproj b/tests/src/JIT/jit64/opt/cg/il/ldftn_impl.ilproj
index dc5ec61..72cc4f5 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/il/ldftn_impl.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/ldftn_impl.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldftn.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cg/il/ldftn_opt.ilproj b/tests/src/JIT/jit64/opt/cg/il/ldftn_opt.ilproj
index dc5ec61..72cc4f5 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/il/ldftn_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/ldftn_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="ldftn.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cg/il/ldftn_ret.ilproj b/tests/src/JIT/jit64/opt/cg/il/ldftn_ret.ilproj
index 9663561..99d0587 100644 (file)
--- a/tests/src/JIT/jit64/opt/cg/il/ldftn_ret.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/ldftn_ret.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ldftn.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cprop/Dev10_844071.ilproj b/tests/src/JIT/jit64/opt/cprop/Dev10_844071.ilproj
index b40b84e..386d7f1 100644 (file)
--- a/tests/src/JIT/jit64/opt/cprop/Dev10_844071.ilproj
+++ b/tests/src/JIT/jit64/opt/cprop/Dev10_844071.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="Dev10_844071.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cprop/Dev10_884217_IL.ilproj b/tests/src/JIT/jit64/opt/cprop/Dev10_884217_IL.ilproj
index 73e8ac3..ae7360f 100644 (file)
--- a/tests/src/JIT/jit64/opt/cprop/Dev10_884217_IL.ilproj
+++ b/tests/src/JIT/jit64/opt/cprop/Dev10_884217_IL.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="Dev10_884217_IL.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cprop/cprop002.ilproj b/tests/src/JIT/jit64/opt/cprop/cprop002.ilproj
index ccc6115..a9644a3 100644 (file)
--- a/tests/src/JIT/jit64/opt/cprop/cprop002.ilproj
+++ b/tests/src/JIT/jit64/opt/cprop/cprop002.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="cprop002.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/cse/HugeArray.csproj b/tests/src/JIT/jit64/opt/cse/HugeArray.csproj
index db9dfe6..cc130de 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/HugeArray.csproj
+++ b/tests/src/JIT/jit64/opt/cse/HugeArray.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="HugeArray.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj b/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj
index 0cf5adb..7a5352e 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="HugeArray1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/HugeField1.csproj b/tests/src/JIT/jit64/opt/cse/HugeField1.csproj
index 5c30364..be3bbb6 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/HugeField1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/HugeField1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="HugeField1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/HugeField2.csproj b/tests/src/JIT/jit64/opt/cse/HugeField2.csproj
index 1395406..2272dc5 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/HugeField2.csproj
+++ b/tests/src/JIT/jit64/opt/cse/HugeField2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="HugeField2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj
index 7c513c8..72891a1 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="arrayexpr1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj
index 77a7657..c73a6c2 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj
+++ b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="arrayexpr2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj b/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj
index a81a136..c181f46 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="fieldExprUnchecked1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj b/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj
index 7dacecf..e1a1be7 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="fieldexpr1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj
index 1b3ce4b..ef49e07 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="fieldexpr1_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj b/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj
index d536c57..8be85ce 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj
+++ b/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="fieldexpr2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj b/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
index b95b4b5..6302d58 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="hugeSimpleExpr1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj b/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
index bfa4b1a..71b2d29 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="hugeexpr1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj
index 232f6de..100e1e4 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj
+++ b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="mixedexpr1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj b/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj
index c1195b9..84c570a 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pointerexpr1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj
index 26c7e72..0245463 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="pointerexpr1_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj
index 05a7c5a..196456e 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="simpleexpr1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj
index 05e5230..6225517 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="simpleexpr1_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj
index 61ca082..7beec10 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="simpleexpr2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj
index 456ce4a..4435555 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="simpleexpr3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj
index 550c1ac..d9231ed 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="simpleexpr4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj
index 85a3673..d52c6f2 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="staticFieldExpr1_1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj
index 453af3a..c40d822 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="staticFieldExpr1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj
index 7fa25a5..8fdb697 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="staticFieldExprUnchecked1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/volatilefield.csproj b/tests/src/JIT/jit64/opt/cse/volatilefield.csproj
index 40c263b..a1b53d2 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/volatilefield.csproj
+++ b/tests/src/JIT/jit64/opt/cse/volatilefield.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="volatilefield.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj b/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj
index b81277a..fa75427 100644 (file)
--- a/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj
+++ b/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="volatilestaticfield.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/inl/caninline_d.csproj b/tests/src/JIT/jit64/opt/inl/caninline_d.csproj
index 12ae45c..6619245 100644 (file)
--- a/tests/src/JIT/jit64/opt/inl/caninline_d.csproj
+++ b/tests/src/JIT/jit64/opt/inl/caninline_d.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="caninline.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/inl/caninline_do.csproj b/tests/src/JIT/jit64/opt/inl/caninline_do.csproj
index 1453d9e..e26a7cc 100644 (file)
--- a/tests/src/JIT/jit64/opt/inl/caninline_do.csproj
+++ b/tests/src/JIT/jit64/opt/inl/caninline_do.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="caninline.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/inl/caninline_r.csproj b/tests/src/JIT/jit64/opt/inl/caninline_r.csproj
index 12ae45c..6619245 100644 (file)
--- a/tests/src/JIT/jit64/opt/inl/caninline_r.csproj
+++ b/tests/src/JIT/jit64/opt/inl/caninline_r.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="caninline.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj b/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj
index 1453d9e..e26a7cc 100644 (file)
--- a/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj
+++ b/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="caninline.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/inl/inl001.ilproj b/tests/src/JIT/jit64/opt/inl/inl001.ilproj
index 5956b70..c82230c 100644 (file)
--- a/tests/src/JIT/jit64/opt/inl/inl001.ilproj
+++ b/tests/src/JIT/jit64/opt/inl/inl001.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="inl001.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/lim/lim_001.ilproj b/tests/src/JIT/jit64/opt/lim/lim_001.ilproj
index a374544..aac8fda 100644 (file)
--- a/tests/src/JIT/jit64/opt/lim/lim_001.ilproj
+++ b/tests/src/JIT/jit64/opt/lim/lim_001.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lim_001.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/lim/lim_002.csproj b/tests/src/JIT/jit64/opt/lim/lim_002.csproj
index dad602f..879740a 100644 (file)
--- a/tests/src/JIT/jit64/opt/lim/lim_002.csproj
+++ b/tests/src/JIT/jit64/opt/lim/lim_002.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="lim_002.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/lur/lur_01.ilproj b/tests/src/JIT/jit64/opt/lur/lur_01.ilproj
index 4bbe8fd..5345614 100644 (file)
--- a/tests/src/JIT/jit64/opt/lur/lur_01.ilproj
+++ b/tests/src/JIT/jit64/opt/lur/lur_01.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="lur_01.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/lur/lur_02.csproj b/tests/src/JIT/jit64/opt/lur/lur_02.csproj
index fe44bf9..1c6b680 100644 (file)
--- a/tests/src/JIT/jit64/opt/lur/lur_02.csproj
+++ b/tests/src/JIT/jit64/opt/lur/lur_02.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="lur_02.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/osr/osr001.csproj b/tests/src/JIT/jit64/opt/osr/osr001.csproj
index f28d52f..a77dd9f 100644 (file)
--- a/tests/src/JIT/jit64/opt/osr/osr001.csproj
+++ b/tests/src/JIT/jit64/opt/osr/osr001.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="osr001.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/osr/osr015.ilproj b/tests/src/JIT/jit64/opt/osr/osr015.ilproj
index e40d1ef..9526b99 100644 (file)
--- a/tests/src/JIT/jit64/opt/osr/osr015.ilproj
+++ b/tests/src/JIT/jit64/opt/osr/osr015.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="osr015.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_dbg.ilproj
index 364abb5..bd444f0 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="bne.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_opt.ilproj
index 688843d..1ca3117 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="bne.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_dbg.ilproj
index 7463990..df9667c 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="conv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_opt.ilproj
index e90eed6..77eb2f7 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="conv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_dbg.ilproj
index 674ea95..733dd3c 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="div.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_opt.ilproj
index 5f43f02..e68b211 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="div.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_dbg.ilproj
index 8a8cd74..e2cacc1 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="mul1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_opt.ilproj
index 1c29aa6..0f4c27e 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="mul1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_dbg.ilproj
index 0c7e7bc..ea669e7 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="mul_exception.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_opt.ilproj
index 258a8fb..113279c 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="mul_exception.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_dbg.ilproj
index 5b2070f..dae7972 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="rem.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_opt.ilproj
index d0ae8a4..5c2b89d 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="rem.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_dbg.ilproj
index 7463990..df9667c 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="conv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_opt.ilproj
index e90eed6..77eb2f7 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="conv.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_dbg.ilproj
index bfc1c08..e29e4a3 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="foo2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_opt.ilproj
index ca9ff06..a741adf 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="foo2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_dbg.ilproj
index 7797469..10832ef 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_dbg.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="foo.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_opt.ilproj
index a047746..d5129e3 100644 (file)
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_opt.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="foo.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj
index ba164c5..c4361ee 100644 (file)
--- a/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ArrayBound.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj
index 4c2c599..1b6acd7 100644 (file)
--- a/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ArrayWith2Loops.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj
index 023b0cb..8d21f5f 100644 (file)
--- a/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ArrayWithFunc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj b/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj
index a1be555..f92b211 100644 (file)
--- a/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="BadMatrixMul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj b/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj
index eb53cd6..4e3e015 100644 (file)
--- a/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="JaggedArray.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj b/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj
index 0f1f2a1..b4d4004 100644 (file)
--- a/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="MatrixMul.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj b/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj
index c51959c..af3f0c7 100644 (file)
--- a/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="RngchkStress1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj b/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj
index a918c02..85dde59 100644 (file)
--- a/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="RngchkStress2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj b/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj
index 16ea538..3de7b44 100644 (file)
--- a/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="RngchkStress3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj b/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj
index 5e86c2b..e4e85d3 100644 (file)
--- a/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="SimpleArray_01.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj b/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj
index 4f9d4a2..611483a 100644 (file)
--- a/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj
+++ b/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="foo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj b/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj
index 87e6271..6e2eeab 100644 (file)
--- a/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj
+++ b/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="103087.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj b/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj
index 5929da9..b4bddba 100644 (file)
--- a/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj
+++ b/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="113574.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/ddb/118414/118414.ilproj b/tests/src/JIT/jit64/regress/ddb/118414/118414.ilproj
index 031687f..2052d67 100644 (file)
--- a/tests/src/JIT/jit64/regress/ddb/118414/118414.ilproj
+++ b/tests/src/JIT/jit64/regress/ddb/118414/118414.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="118414.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj b/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj
index 71dc037..355829f 100644 (file)
--- a/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj
+++ b/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="127931.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj b/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj
index 995af47..7cc7618 100644 (file)
--- a/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj
+++ b/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="132977.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj b/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj
index 401c89b..4e83ed3 100644 (file)
--- a/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj
+++ b/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="simple.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj b/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj
index c4a09ee..6fade42 100644 (file)
--- a/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj
+++ b/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="interior_pointer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj b/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj
index 60fa807..005d45c 100644 (file)
--- a/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj
+++ b/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/102964/test.csproj b/tests/src/JIT/jit64/regress/vsw/102964/test.csproj
index 820a7dd..ca2d4f2 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/102964/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/102964/test.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj b/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj
index 60fa807..005d45c 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj b/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj
index 60fa807..005d45c 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj b/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj
index 60fa807..005d45c 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/329169/test.csproj b/tests/src/JIT/jit64/regress/vsw/329169/test.csproj
index 820a7dd..ca2d4f2 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/329169/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/329169/test.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/333007/test1.ilproj b/tests/src/JIT/jit64/regress/vsw/333007/test1.ilproj
index e9d485f..d40c5e5 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/333007/test1.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/333007/test1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj b/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj
index e9d485f..d40c5e5 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/373472/test.csproj b/tests/src/JIT/jit64/regress/vsw/373472/test.csproj
index 91e2835..785a7a7 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/373472/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/373472/test.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/373472/test.ilproj b/tests/src/JIT/jit64/regress/vsw/373472/test.ilproj
index e03cb01..e1f57ec 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/373472/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/373472/test.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj b/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj
index 60fa807..005d45c 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj b/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj
index 60fa807..005d45c 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/471729/test.csproj b/tests/src/JIT/jit64/regress/vsw/471729/test.csproj
index 820a7dd..ca2d4f2 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/471729/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/471729/test.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/517867/test.csproj b/tests/src/JIT/jit64/regress/vsw/517867/test.csproj
index 22d34e2..47b8ad6 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/517867/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/517867/test.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj b/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj
index 81b3c3a..40fb927 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj b/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj
index b8d3f9a..37ed362 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj b/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj
index 860a872..ac4e7bd 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="simple-repro.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/534486/exchange.ilproj b/tests/src/JIT/jit64/regress/vsw/534486/exchange.ilproj
index 0507aef..31485dc 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/534486/exchange.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/534486/exchange.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="exchange.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj b/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj
index 81b3c3a..40fb927 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj b/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj
index 57a90d0..e30ae66 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj b/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj
index 81b3c3a..40fb927 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/543229/test.csproj b/tests/src/JIT/jit64/regress/vsw/543229/test.csproj
index 22d34e2..47b8ad6 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/543229/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/543229/test.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/549880/test.csproj b/tests/src/JIT/jit64/regress/vsw/549880/test.csproj
index 820a7dd..ca2d4f2 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/549880/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/549880/test.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,14 +33,15 @@
     <Compile Include="test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj b/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj
index 60fa807..005d45c 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj b/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj
index 2513a32..d232c93 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="test2.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj b/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj
index b976d53..4581913 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="stret.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj b/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj
index 1186aac..56ae6b1 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="Bug606733.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj b/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj
index 3e9e925..4e59bdb 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="607586.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj b/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj
index 927188a..82d30d4 100644 (file)
--- a/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="BigFrame.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/jit64/verif/sniff/fg/ver_fg_13.ilproj b/tests/src/JIT/jit64/verif/sniff/fg/ver_fg_13.ilproj
index e58a457..000b6a4 100644 (file)
--- a/tests/src/JIT/jit64/verif/sniff/fg/ver_fg_13.ilproj
+++ b/tests/src/JIT/jit64/verif/sniff/fg/ver_fg_13.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
     <Compile Include="ver_fg_13.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/AssertionPropagation/CPropOverflow.ilproj b/tests/src/JIT/opt/AssertionPropagation/CPropOverflow.ilproj
index 10bed7a..2f0c197 100644 (file)
--- a/tests/src/JIT/opt/AssertionPropagation/CPropOverflow.ilproj
+++ b/tests/src/JIT/opt/AssertionPropagation/CPropOverflow.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="CPropOverflow.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/BBCnt1.ilproj b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/BBCnt1.ilproj
index 45955b1..50f50f6 100644 (file)
--- a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/BBCnt1.ilproj
+++ b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/BBCnt1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="BBCnt1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/CodeSize1.ilproj b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/CodeSize1.ilproj
index cd8f175..9db3281 100644 (file)
--- a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/CodeSize1.ilproj
+++ b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/CodeSize1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="CodeSize1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/InstrCnt1.ilproj b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/InstrCnt1.ilproj
index 4174ae7..df42e34 100644 (file)
--- a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/InstrCnt1.ilproj
+++ b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/InstrCnt1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="InstrCnt1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVNumCnt1.ilproj b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVNumCnt1.ilproj
index f6ec262..343d920 100644 (file)
--- a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVNumCnt1.ilproj
+++ b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVNumCnt1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="LVNumCnt1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVRefCnt1.ilproj b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVRefCnt1.ilproj
index 5f3d476..fd608e6 100644 (file)
--- a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVRefCnt1.ilproj
+++ b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVRefCnt1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="LVRefCnt1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/ETW/TailCallCases.ilproj b/tests/src/JIT/opt/ETW/TailCallCases.ilproj
index e6b3093..5a47dba 100644 (file)
--- a/tests/src/JIT/opt/ETW/TailCallCases.ilproj
+++ b/tests/src/JIT/opt/ETW/TailCallCases.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="TailCallCases.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/Inline/ArrayOfStructs.csproj b/tests/src/JIT/opt/Inline/ArrayOfStructs.csproj
index 1a75a07..41e645a 100644 (file)
--- a/tests/src/JIT/opt/Inline/ArrayOfStructs.csproj
+++ b/tests/src/JIT/opt/Inline/ArrayOfStructs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ArrayOfStructs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/DelegInstanceFtn.csproj b/tests/src/JIT/opt/Inline/DelegInstanceFtn.csproj
index 47342a9..b93bf6b 100644 (file)
--- a/tests/src/JIT/opt/Inline/DelegInstanceFtn.csproj
+++ b/tests/src/JIT/opt/Inline/DelegInstanceFtn.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DelegInstanceFtn.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/DelegStaticFtn.csproj b/tests/src/JIT/opt/Inline/DelegStaticFtn.csproj
index fb4a762..6911ec7 100644 (file)
--- a/tests/src/JIT/opt/Inline/DelegStaticFtn.csproj
+++ b/tests/src/JIT/opt/Inline/DelegStaticFtn.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="DelegStaticFtn.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/GenericStructs.csproj b/tests/src/JIT/opt/Inline/GenericStructs.csproj
index f544fe3..1ea52b0 100644 (file)
--- a/tests/src/JIT/opt/Inline/GenericStructs.csproj
+++ b/tests/src/JIT/opt/Inline/GenericStructs.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="GenericStructs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/InlineThrow.csproj b/tests/src/JIT/opt/Inline/InlineThrow.csproj
index 2e683ff..a9b22e2 100644 (file)
--- a/tests/src/JIT/opt/Inline/InlineThrow.csproj
+++ b/tests/src/JIT/opt/Inline/InlineThrow.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="InlineThrow.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_DelegateStruct.csproj b/tests/src/JIT/opt/Inline/Inline_DelegateStruct.csproj
index d663b12..8509954 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_DelegateStruct.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_DelegateStruct.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_DelegateStruct.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_GenericMethods.csproj b/tests/src/JIT/opt/Inline/Inline_GenericMethods.csproj
index 239c443..0595f7e 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_GenericMethods.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_GenericMethods.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_GenericMethods.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_Handler.csproj b/tests/src/JIT/opt/Inline/Inline_Handler.csproj
index 22cd2e4..ea5a8f0 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_Handler.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_Handler.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_Handler.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_MultipleReturn.csproj b/tests/src/JIT/opt/Inline/Inline_MultipleReturn.csproj
index 5d0e02a..53aed23 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_MultipleReturn.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_MultipleReturn.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_MultipleReturn.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_NewObj.csproj b/tests/src/JIT/opt/Inline/Inline_NewObj.csproj
index 85d1d4f..4f4b5eb 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_NewObj.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_NewObj.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_NewObj.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_NormalizeStack.csproj b/tests/src/JIT/opt/Inline/Inline_NormalizeStack.csproj
index 48c4ced..a9ef1be 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_NormalizeStack.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_NormalizeStack.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_NormalizeStack.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_RecursiveMethod.csproj b/tests/src/JIT/opt/Inline/Inline_RecursiveMethod.csproj
index 4c477c5..2d17286 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_RecursiveMethod.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_RecursiveMethod.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_RecursiveMethod.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_RecursiveMethod21.csproj b/tests/src/JIT/opt/Inline/Inline_RecursiveMethod21.csproj
index cfc6632..6e06da2 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_RecursiveMethod21.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_RecursiveMethod21.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_RecursiveMethod21.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_STARG.csproj b/tests/src/JIT/opt/Inline/Inline_STARG.csproj
index 717802a..5398538 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_STARG.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_STARG.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_STARG.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_SideAffects.csproj b/tests/src/JIT/opt/Inline/Inline_SideAffects.csproj
index f5e2b14..f2341f1 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_SideAffects.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_SideAffects.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_SideAffects.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Inline_Vars.csproj b/tests/src/JIT/opt/Inline/Inline_Vars.csproj
index 7df45ad..e0755ad 100644 (file)
--- a/tests/src/JIT/opt/Inline/Inline_Vars.csproj
+++ b/tests/src/JIT/opt/Inline/Inline_Vars.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Inline_Vars.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/ReturnStruct_Method.csproj b/tests/src/JIT/opt/Inline/ReturnStruct_Method.csproj
index e60590c..fbc1aa9 100644 (file)
--- a/tests/src/JIT/opt/Inline/ReturnStruct_Method.csproj
+++ b/tests/src/JIT/opt/Inline/ReturnStruct_Method.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ReturnStruct_Method.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/StructAsParam_Method.csproj b/tests/src/JIT/opt/Inline/StructAsParam_Method.csproj
index c76d1cb..fc068da 100644 (file)
--- a/tests/src/JIT/opt/Inline/StructAsParam_Method.csproj
+++ b/tests/src/JIT/opt/Inline/StructAsParam_Method.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="StructAsParam_Method.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/StructInClass.csproj b/tests/src/JIT/opt/Inline/StructInClass.csproj
index f6bea39..6ade220 100644 (file)
--- a/tests/src/JIT/opt/Inline/StructInClass.csproj
+++ b/tests/src/JIT/opt/Inline/StructInClass.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="StructInClass.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/Struct_Opcodes.csproj b/tests/src/JIT/opt/Inline/Struct_Opcodes.csproj
index f4fc3f9..6e538ee 100644 (file)
--- a/tests/src/JIT/opt/Inline/Struct_Opcodes.csproj
+++ b/tests/src/JIT/opt/Inline/Struct_Opcodes.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="Struct_Opcodes.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/args1.csproj b/tests/src/JIT/opt/Inline/args1.csproj
index ca2840b..bd441e9 100644 (file)
--- a/tests/src/JIT/opt/Inline/args1.csproj
+++ b/tests/src/JIT/opt/Inline/args1.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="args1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/args2.csproj b/tests/src/JIT/opt/Inline/args2.csproj
index 5e26db4..3d90427 100644 (file)
--- a/tests/src/JIT/opt/Inline/args2.csproj
+++ b/tests/src/JIT/opt/Inline/args2.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="args2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/args3.csproj b/tests/src/JIT/opt/Inline/args3.csproj
index b246a07..8c37dfe 100644 (file)
--- a/tests/src/JIT/opt/Inline/args3.csproj
+++ b/tests/src/JIT/opt/Inline/args3.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="args3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/array.csproj b/tests/src/JIT/opt/Inline/array.csproj
index 9b573dd..7f9f159 100644 (file)
--- a/tests/src/JIT/opt/Inline/array.csproj
+++ b/tests/src/JIT/opt/Inline/array.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="array.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/debug.csproj b/tests/src/JIT/opt/Inline/debug.csproj
index 21810a2..ae8148d 100644 (file)
--- a/tests/src/JIT/opt/Inline/debug.csproj
+++ b/tests/src/JIT/opt/Inline/debug.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="debug.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/deepcall.csproj b/tests/src/JIT/opt/Inline/deepcall.csproj
index a76d5b1..5f44f14 100644 (file)
--- a/tests/src/JIT/opt/Inline/deepcall.csproj
+++ b/tests/src/JIT/opt/Inline/deepcall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="deepcall.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/ifelse.csproj b/tests/src/JIT/opt/Inline/ifelse.csproj
index 5e3083a..24af0ec 100644 (file)
--- a/tests/src/JIT/opt/Inline/ifelse.csproj
+++ b/tests/src/JIT/opt/Inline/ifelse.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="ifelse.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/indexer.csproj b/tests/src/JIT/opt/Inline/indexer.csproj
index 1c9e1fc..b587fe9 100644 (file)
--- a/tests/src/JIT/opt/Inline/indexer.csproj
+++ b/tests/src/JIT/opt/Inline/indexer.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="indexer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/inline.csproj b/tests/src/JIT/opt/Inline/inline.csproj
index 05240b7..3113570 100644 (file)
--- a/tests/src/JIT/opt/Inline/inline.csproj
+++ b/tests/src/JIT/opt/Inline/inline.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="inline.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/inline_Many.csproj b/tests/src/JIT/opt/Inline/inline_Many.csproj
index abf7479..d2ffa46 100644 (file)
--- a/tests/src/JIT/opt/Inline/inline_Many.csproj
+++ b/tests/src/JIT/opt/Inline/inline_Many.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="inline_Many.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/inline_Recursion.csproj b/tests/src/JIT/opt/Inline/inline_Recursion.csproj
index f2097bf..d3485f4 100644 (file)
--- a/tests/src/JIT/opt/Inline/inline_Recursion.csproj
+++ b/tests/src/JIT/opt/Inline/inline_Recursion.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="inline_Recursion.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/interfaceCall.csproj b/tests/src/JIT/opt/Inline/interfaceCall.csproj
index 86155e9..e800310 100644 (file)
--- a/tests/src/JIT/opt/Inline/interfaceCall.csproj
+++ b/tests/src/JIT/opt/Inline/interfaceCall.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="interfaceCall.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/interfaceProperty.csproj b/tests/src/JIT/opt/Inline/interfaceProperty.csproj
index 0cdf67b..a3aac62 100644 (file)
--- a/tests/src/JIT/opt/Inline/interfaceProperty.csproj
+++ b/tests/src/JIT/opt/Inline/interfaceProperty.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="interfaceProperty.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/mathfunc.csproj b/tests/src/JIT/opt/Inline/mathfunc.csproj
index 5b51d65..88a7363 100644 (file)
--- a/tests/src/JIT/opt/Inline/mathfunc.csproj
+++ b/tests/src/JIT/opt/Inline/mathfunc.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="mathfunc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/mthdimpl.csproj b/tests/src/JIT/opt/Inline/mthdimpl.csproj
index debd7a2..fb92e3b 100644 (file)
--- a/tests/src/JIT/opt/Inline/mthdimpl.csproj
+++ b/tests/src/JIT/opt/Inline/mthdimpl.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="mthdimpl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/property.csproj b/tests/src/JIT/opt/Inline/property.csproj
index e0be7c7..c3a2236 100644 (file)
--- a/tests/src/JIT/opt/Inline/property.csproj
+++ b/tests/src/JIT/opt/Inline/property.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="property.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/size.csproj b/tests/src/JIT/opt/Inline/size.csproj
index cd66a0c..c49986c 100644 (file)
--- a/tests/src/JIT/opt/Inline/size.csproj
+++ b/tests/src/JIT/opt/Inline/size.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="size.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/throwTest.csproj b/tests/src/JIT/opt/Inline/throwTest.csproj
index a8a3de6..1158335 100644 (file)
--- a/tests/src/JIT/opt/Inline/throwTest.csproj
+++ b/tests/src/JIT/opt/Inline/throwTest.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="throwTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/Inline/trycatch.csproj b/tests/src/JIT/opt/Inline/trycatch.csproj
index 65427b7..990d4b5 100644 (file)
--- a/tests/src/JIT/opt/Inline/trycatch.csproj
+++ b/tests/src/JIT/opt/Inline/trycatch.csproj
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
     <Compile Include="trycatch.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+    <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
-    <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">

diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt0.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt0.ilproj
index febb56b..48b9ec7 100644 (file)
--- a/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt0.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt0.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="BBCnt0.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt1.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt1.ilproj
index 45955b1..50f50f6 100644 (file)
--- a/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt1.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="BBCnt1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize0.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize0.ilproj
index 3ada47f..9780660 100644 (file)
--- a/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize0.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize0.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="CodeSize0.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize1.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize1.ilproj
index cd8f175..9db3281 100644 (file)
--- a/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize1.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="CodeSize1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt0.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt0.ilproj
index 3a6b129..bc182ed 100644 (file)
--- a/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt0.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt0.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="InstrCnt0.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt1.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt1.ilproj
index 4174ae7..df42e34 100644 (file)
--- a/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt1.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="InstrCnt1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt0.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt0.ilproj
index 00f4fab..ba1554a 100644 (file)
--- a/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt0.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt0.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="LVNumCnt0.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt1.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt1.ilproj
index f6ec262..343d920 100644 (file)
--- a/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt1.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="LVNumCnt1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt0.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt0.ilproj
index 67253f1..acc34b1 100644 (file)
--- a/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt0.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt0.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="LVRefCnt0.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt1.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt1.ilproj
index 5f3d476..fd608e6 100644 (file)
--- a/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt1.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt1.ilproj
@@ -13,7 +13,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -34,7 +33,6 @@
     <Compile Include="LVRefCnt1.il" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/src/Loader/regressions/classloader-generics/Classloader-Generics.csproj b/tests/src/Loader/regressions/classloader-generics/Classloader-Generics.csproj
index 499d0f3..9549bec 100644 (file)
--- a/tests/src/Loader/regressions/classloader-generics/Classloader-Generics.csproj
+++ b/tests/src/Loader/regressions/classloader-generics/Classloader-Generics.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{D6633F9C-C79B-422B-BCC0-1AF80A673A24}</ProjectGuid>
@@ -10,6 +10,9 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
   <Target Name="Build">
     <ItemGroup>
       <AllSourceFiles Include="$(MSBuildProjectDirectory)\*.cs" />
@@ -18,6 +21,6 @@
     <PropertyGroup>
       <GenerateRunScript>false</GenerateRunScript>
     </PropertyGroup>
-    <MSBuild Projects="cs_template.proj" Properties="AssemblyName1=%(AllSourceFiles.FileName);IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" Condition="'@(AllSourceFiles)' != ''" />
+    <MSBuild Projects="cs_template.csproj" Properties="AssemblyName1=%(AllSourceFiles.FileName);IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" Condition="'@(AllSourceFiles)' != ''" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Loader/regressions/classloader-generics/cs_template.proj b/tests/src/Loader/regressions/classloader-generics/cs_template.csproj
similarity index 87%
rename from tests/src/Loader/regressions/classloader-generics/cs_template.proj
rename to tests/src/Loader/regressions/classloader-generics/cs_template.csproj
index adc2f21..fc31cd9 100644 (file)
--- a/tests/src/Loader/regressions/classloader-generics/cs_template.proj
+++ b/tests/src/Loader/regressions/classloader-generics/cs_template.csproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -30,13 +30,13 @@
     <Compile Include="$(AssemblyName1).cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Loader/regressions/classloader-generics/packages.config b/tests/src/Loader/regressions/classloader-generics/packages.config
deleted file mode 100644 (file)
index 5d8df84..0000000
--- a/tests/src/Loader/regressions/classloader-generics/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-    <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-    <package id="System.Reflection" version="4.0.10-beta-22512" />
-</packages>

diff --git a/tests/src/Loader/regressions/classloader-generics/project.json b/tests/src/Loader/regressions/classloader-generics/project.json
new file mode 100644 (file)
index 0000000..ee126a3
--- /dev/null
+++ b/tests/src/Loader/regressions/classloader-generics/project.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Reflection": "4.0.10-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Loader/regressions/classloader-generics/project.lock.json b/tests/src/Loader/regressions/classloader-generics/project.lock.json
new file mode 100644 (file)
index 0000000..7afef02
--- /dev/null
+++ b/tests/src/Loader/regressions/classloader-generics/project.lock.json
@@ -0,0 +1,605 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.10-beta-23024": {
+      "sha512": "Ky5yclJBgNu+NArFSblpe2FZ/IeLeOYLIP8hLBwTiVDRufjWDqPKcPtETfnmyZq61HGyhTJWFd1uEkhDOgxF9g==",
+      "files": [
+        "System.Reflection.4.0.10-beta-23024.nupkg",
+        "System.Reflection.4.0.10-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/DNXCore50/System.Reflection.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.dll"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "uoRg44bzPk9KE9Sg6rLZmGfUmFZBDc7y25692VYna/WW3Smip/aGX0ESXyuNvWA8k8oXdV4Z/M4ZKdB3ahtdDw==",
+      "files": [
+        "System.Threading.4.0.10-beta-23024.nupkg",
+        "System.Threading.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/DNXCore50/System.Threading.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.dll",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Reflection >= 4.0.10-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Loader/regressions/classloader/ClassLoader.csproj b/tests/src/Loader/regressions/classloader/ClassLoader.csproj
index c2c5eb4..ba68d91 100644 (file)
--- a/tests/src/Loader/regressions/classloader/ClassLoader.csproj
+++ b/tests/src/Loader/regressions/classloader/ClassLoader.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
@@ -7,6 +7,9 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
   <Target Name="Build">
     <ItemGroup>
       <AllSourceFiles Include="$(MSBuildProjectDirectory)\*.cs" />
@@ -17,6 +20,6 @@
     <PropertyGroup>
       <GenerateRunScript>false</GenerateRunScript>
     </PropertyGroup>
-    <MSBuild Projects="cs_template.proj" Properties="AssemblyName1=%(AllSourceFiles.FileName);AllowUnsafeBlocks=True;IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" Condition="'@(AllSourceFiles)' != ''" />
+    <MSBuild Projects="cs_template.csproj" Properties="AssemblyName1=%(AllSourceFiles.FileName);AllowUnsafeBlocks=True;IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" Condition="'@(AllSourceFiles)' != ''" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Threading/ThreadStatics/cs_template.proj b/tests/src/Loader/regressions/classloader/cs_template.csproj
similarity index 87%
rename from tests/src/Threading/ThreadStatics/cs_template.proj
rename to tests/src/Loader/regressions/classloader/cs_template.csproj
index adc2f21..fc31cd9 100644 (file)
--- a/tests/src/Threading/ThreadStatics/cs_template.proj
+++ b/tests/src/Loader/regressions/classloader/cs_template.csproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -30,13 +30,13 @@
     <Compile Include="$(AssemblyName1).cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Loader/regressions/classloader/packages.config b/tests/src/Loader/regressions/classloader/packages.config
deleted file mode 100644 (file)
index 21804ee..0000000
--- a/tests/src/Loader/regressions/classloader/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-    <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-    <package id="System.Reflection" version="4.0.10-beta-22512" />
-    <package id="System.Threading" version="4.0.0-beta-22412" />
-    <package id="System.Threading.Thread" version="4.0.0-beta-22512" />
-</packages>

diff --git a/tests/src/Loader/regressions/classloader/project.json b/tests/src/Loader/regressions/classloader/project.json
new file mode 100644 (file)
index 0000000..399d5d8
--- /dev/null
+++ b/tests/src/Loader/regressions/classloader/project.json
@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Reflection": "4.0.10-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+    "System.Threading.Thread": "4.0.0-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Loader/regressions/classloader/project.lock.json b/tests/src/Loader/regressions/classloader/project.lock.json
new file mode 100644 (file)
index 0000000..9db6350
--- /dev/null
+++ b/tests/src/Loader/regressions/classloader/project.lock.json
@@ -0,0 +1,647 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Thread/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Thread.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Thread.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.10-beta-23024": {
+      "sha512": "Ky5yclJBgNu+NArFSblpe2FZ/IeLeOYLIP8hLBwTiVDRufjWDqPKcPtETfnmyZq61HGyhTJWFd1uEkhDOgxF9g==",
+      "files": [
+        "System.Reflection.4.0.10-beta-23024.nupkg",
+        "System.Reflection.4.0.10-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/DNXCore50/System.Reflection.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.dll"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Thread/4.0.0-beta-23024": {
+      "sha512": "aeok537DgipEVRaoFjfYFf5MAyKm6eXKQQibvvHDertRXx+h1a7sIxt+K9QEHbjxDeKC+06orbGMlasNPSLxHA==",
+      "files": [
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg",
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Thread.nuspec",
+        "lib/DNXCore50/System.Threading.Thread.dll",
+        "lib/net46/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.xml",
+        "ref/dotnet/de/System.Threading.Thread.xml",
+        "ref/dotnet/es/System.Threading.Thread.xml",
+        "ref/dotnet/fr/System.Threading.Thread.xml",
+        "ref/dotnet/it/System.Threading.Thread.xml",
+        "ref/dotnet/ja/System.Threading.Thread.xml",
+        "ref/dotnet/ko/System.Threading.Thread.xml",
+        "ref/dotnet/ru/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hans/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hant/System.Threading.Thread.xml",
+        "ref/net46/System.Threading.Thread.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Reflection >= 4.0.10-beta-*",
+      "System.Threading >= 4.0.0-beta-*",
+      "System.Threading.Thread >= 4.0.0-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Loader/regressions/polyrec/Polyrec.csproj b/tests/src/Loader/regressions/polyrec/Polyrec.csproj
index 3f3970f..45fa8c8 100644 (file)
--- a/tests/src/Loader/regressions/polyrec/Polyrec.csproj
+++ b/tests/src/Loader/regressions/polyrec/Polyrec.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestExecutionArguments>4 50</CLRTestExecutionArguments>
@@ -32,11 +32,11 @@
     <Compile Include="polyrec.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Loader/regressions/polyrec/packages.config b/tests/src/Loader/regressions/polyrec/packages.config
deleted file mode 100644 (file)
index 21804ee..0000000
--- a/tests/src/Loader/regressions/polyrec/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-    <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-    <package id="System.Reflection" version="4.0.10-beta-22512" />
-    <package id="System.Threading" version="4.0.0-beta-22412" />
-    <package id="System.Threading.Thread" version="4.0.0-beta-22512" />
-</packages>

diff --git a/tests/src/Loader/regressions/polyrec/project.json b/tests/src/Loader/regressions/polyrec/project.json
new file mode 100644 (file)
index 0000000..399d5d8
--- /dev/null
+++ b/tests/src/Loader/regressions/polyrec/project.json
@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Reflection": "4.0.10-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+    "System.Threading.Thread": "4.0.0-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Loader/regressions/polyrec/project.lock.json b/tests/src/Loader/regressions/polyrec/project.lock.json
new file mode 100644 (file)
index 0000000..9db6350
--- /dev/null
+++ b/tests/src/Loader/regressions/polyrec/project.lock.json
@@ -0,0 +1,647 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Thread/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Thread.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Thread.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.10-beta-23024": {
+      "sha512": "Ky5yclJBgNu+NArFSblpe2FZ/IeLeOYLIP8hLBwTiVDRufjWDqPKcPtETfnmyZq61HGyhTJWFd1uEkhDOgxF9g==",
+      "files": [
+        "System.Reflection.4.0.10-beta-23024.nupkg",
+        "System.Reflection.4.0.10-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/DNXCore50/System.Reflection.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.dll"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Thread/4.0.0-beta-23024": {
+      "sha512": "aeok537DgipEVRaoFjfYFf5MAyKm6eXKQQibvvHDertRXx+h1a7sIxt+K9QEHbjxDeKC+06orbGMlasNPSLxHA==",
+      "files": [
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg",
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Thread.nuspec",
+        "lib/DNXCore50/System.Threading.Thread.dll",
+        "lib/net46/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.xml",
+        "ref/dotnet/de/System.Threading.Thread.xml",
+        "ref/dotnet/es/System.Threading.Thread.xml",
+        "ref/dotnet/fr/System.Threading.Thread.xml",
+        "ref/dotnet/it/System.Threading.Thread.xml",
+        "ref/dotnet/ja/System.Threading.Thread.xml",
+        "ref/dotnet/ko/System.Threading.Thread.xml",
+        "ref/dotnet/ru/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hans/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hant/System.Threading.Thread.xml",
+        "ref/net46/System.Threading.Thread.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Reflection >= 4.0.10-beta-*",
+      "System.Threading >= 4.0.0-beta-*",
+      "System.Threading.Thread >= 4.0.0-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Loader/typeinitialization/Typeinitialization.csproj b/tests/src/Loader/typeinitialization/Typeinitialization.csproj
index ec70804..a7d3206 100644 (file)
--- a/tests/src/Loader/typeinitialization/Typeinitialization.csproj
+++ b/tests/src/Loader/typeinitialization/Typeinitialization.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
@@ -6,6 +6,9 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
   <Target Name="Build">
     <ItemGroup>
       <AllSourceFiles Include="$(MSBuildProjectDirectory)\*.cs" />
@@ -14,6 +17,6 @@
     <PropertyGroup>
       <GenerateRunScript>false</GenerateRunScript>
     </PropertyGroup>
-    <MSBuild Projects="cs_template.proj" Properties="AssemblyName1=%(AllSourceFiles.FileName);IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" Condition="'@(AllSourceFiles)' != ''" />
+    <MSBuild Projects="cs_template.csproj" Properties="AssemblyName1=%(AllSourceFiles.FileName);IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" Condition="'@(AllSourceFiles)' != ''" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Loader/typeinitialization/cs_template.proj b/tests/src/Loader/typeinitialization/cs_template.csproj
similarity index 87%
rename from tests/src/Loader/typeinitialization/cs_template.proj
rename to tests/src/Loader/typeinitialization/cs_template.csproj
index adc2f21..fc31cd9 100644 (file)
--- a/tests/src/Loader/typeinitialization/cs_template.proj
+++ b/tests/src/Loader/typeinitialization/cs_template.csproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -30,13 +30,13 @@
     <Compile Include="$(AssemblyName1).cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Loader/typeinitialization/packages.config b/tests/src/Loader/typeinitialization/packages.config
deleted file mode 100644 (file)
index 8f8ccd4..0000000
--- a/tests/src/Loader/typeinitialization/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-    <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-    <package id="System.Threading" version="4.0.0-beta-22412" />
-    <package id="System.Threading.Thread" version="4.0.0-beta-22512" />
-</packages>

diff --git a/tests/src/Loader/typeinitialization/project.json b/tests/src/Loader/typeinitialization/project.json
new file mode 100644 (file)
index 0000000..5428e41
--- /dev/null
+++ b/tests/src/Loader/typeinitialization/project.json
@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Threading": "4.0.10-beta-*",
+    "System.Threading.Thread": "4.0.0-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Loader/typeinitialization/project.lock.json b/tests/src/Loader/typeinitialization/project.lock.json
new file mode 100644 (file)
index 0000000..cbe7221
--- /dev/null
+++ b/tests/src/Loader/typeinitialization/project.lock.json
@@ -0,0 +1,647 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Thread/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Thread.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Thread.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "uoRg44bzPk9KE9Sg6rLZmGfUmFZBDc7y25692VYna/WW3Smip/aGX0ESXyuNvWA8k8oXdV4Z/M4ZKdB3ahtdDw==",
+      "files": [
+        "System.Threading.4.0.10-beta-23024.nupkg",
+        "System.Threading.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/DNXCore50/System.Threading.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.dll",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Thread/4.0.0-beta-23024": {
+      "sha512": "aeok537DgipEVRaoFjfYFf5MAyKm6eXKQQibvvHDertRXx+h1a7sIxt+K9QEHbjxDeKC+06orbGMlasNPSLxHA==",
+      "files": [
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg",
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Thread.nuspec",
+        "lib/DNXCore50/System.Threading.Thread.dll",
+        "lib/net46/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.xml",
+        "ref/dotnet/de/System.Threading.Thread.xml",
+        "ref/dotnet/es/System.Threading.Thread.xml",
+        "ref/dotnet/fr/System.Threading.Thread.xml",
+        "ref/dotnet/it/System.Threading.Thread.xml",
+        "ref/dotnet/ja/System.Threading.Thread.xml",
+        "ref/dotnet/ko/System.Threading.Thread.xml",
+        "ref/dotnet/ru/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hans/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hant/System.Threading.Thread.xml",
+        "ref/net46/System.Threading.Thread.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Threading >= 4.0.10-beta-*",
+      "System.Threading.Thread >= 4.0.0-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/NuGet.Config b/tests/src/NuGet.Config
index e7a5050..31b35ef 100644 (file)
--- a/tests/src/NuGet.Config
+++ b/tests/src/NuGet.Config
@@ -4,7 +4,8 @@
     <add key="enabled" value="True" />
   </packageRestore>
   <packageSources>
-    <add key="myget.org dotnet-corefx" value="https://www.myget.org/F/dotnet-corefx/" />
+    <clear/>
+    <add key="myget.org dotnet-corefx" value="https://www.myget.org/F/dotnet-core/" />
     <add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/" />
     <add key="myget.org Microsoft.DotNet.CoreCLR.TestDependencies" value="https://www.myget.org/F/dotnet-coreclr-testdependecies/" />
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />

diff --git a/tests/src/Regressions/assemblyref/assem.csproj b/tests/src/Regressions/assemblyref/assem.csproj
index 0b141a3..63b3f0f 100644 (file)
--- a/tests/src/Regressions/assemblyref/assem.csproj
+++ b/tests/src/Regressions/assemblyref/assem.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
@@ -31,11 +31,11 @@
     <Compile Include="assem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Regressions/assemblyref/packages.config b/tests/src/Regressions/assemblyref/packages.config
deleted file mode 100644 (file)
index 62d801f..0000000
--- a/tests/src/Regressions/assemblyref/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-</packages>

diff --git a/tests/src/Regressions/assemblyref/project.json b/tests/src/Regressions/assemblyref/project.json
new file mode 100644 (file)
index 0000000..47433cd
--- /dev/null
+++ b/tests/src/Regressions/assemblyref/project.json
@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Regressions/assemblyref/project.lock.json b/tests/src/Regressions/assemblyref/project.lock.json
new file mode 100644 (file)
index 0000000..9eb613b
--- /dev/null
+++ b/tests/src/Regressions/assemblyref/project.lock.json
@@ -0,0 +1,575 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "uoRg44bzPk9KE9Sg6rLZmGfUmFZBDc7y25692VYna/WW3Smip/aGX0ESXyuNvWA8k8oXdV4Z/M4ZKdB3ahtdDw==",
+      "files": [
+        "System.Threading.4.0.10-beta-23024.nupkg",
+        "System.Threading.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/DNXCore50/System.Threading.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.dll",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Regressions/assemblyref/test.csproj b/tests/src/Regressions/assemblyref/test.csproj
index f17afb0..72ac326 100644 (file)
--- a/tests/src/Regressions/assemblyref/test.csproj
+++ b/tests/src/Regressions/assemblyref/test.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
@@ -31,8 +31,8 @@
     <Compile Include="Test.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="assem.csproj">
@@ -44,4 +44,4 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Regressions/common/cs_template.proj b/tests/src/Regressions/common/cs_template.csproj
similarity index 82%
rename from tests/src/Regressions/common/cs_template.proj
rename to tests/src/Regressions/common/cs_template.csproj
index 5253003..0bd8b17 100644 (file)
--- a/tests/src/Regressions/common/cs_template.proj
+++ b/tests/src/Regressions/common/cs_template.csproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -30,18 +30,16 @@
     <Compile Include="$(AssemblyName1).cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <ItemGroup>
-     <ProjectReference Include="$(SourceDir)\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+    <ProjectReference Include="$(SourceDir)\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
       <Project>{8ffe99c0-22f8-4462-b839-970eac1b3472}</Project>
       <Name>coreclr</Name>
-    </ProjectReference> 
-
+    </ProjectReference>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Regressions/common/packages.config b/tests/src/Regressions/common/packages.config
deleted file mode 100644 (file)
index 7799c99..0000000
--- a/tests/src/Regressions/common/packages.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-    <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-    <package id="System.Threading" version="4.0.0-beta-22412" />
-    <package id="System.Threading.Thread" version="4.0.0-beta-22512" />
-    <package id="System.IO.FileSystem" version="4.0.0-beta-22412" />
-    <package id="System.IO.FileSystem.Primitives" version="4.0.0-beta-22412" />
-    <package id="System.Reflection" version="4.0.10-beta-22512" />
-    <package id="System.Runtime.InteropServices" version="4.0.20-beta-22512" />
-    <package id="System.Collections" version="4.0.10-beta-22512" />
-    <package id="System.Globalization.Calendars" version="4.0.0-beta-22512" />
-    <package id="System.Globalization" version="4.0.10-beta-22512" />
-    <package id="System.Threading.Timer" version="4.0.0-beta-22512" />
-</packages>

diff --git a/tests/src/Regressions/common/project.json b/tests/src/Regressions/common/project.json
new file mode 100644 (file)
index 0000000..be2ead6
--- /dev/null
+++ b/tests/src/Regressions/common/project.json
@@ -0,0 +1,20 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+    "System.Threading.Thread": "4.0.0-beta-*",
+    "System.IO.FileSystem": "4.0.0-beta-*",
+    "System.IO.FileSystem.Primitives": "4.0.0-beta-*",
+    "System.Reflection": "4.0.10-beta-*",
+    "System.Runtime.InteropServices": "4.0.20-beta-*",
+    "System.Collections": "4.0.10-beta-*",
+    "System.Globalization.Calendars": "4.0.0-beta-*",
+    "System.Globalization": "4.0.10-beta-*",
+    "System.Threading.Timer": "4.0.0-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Regressions/common/project.lock.json b/tests/src/Regressions/common/project.lock.json
new file mode 100644 (file)
index 0000000..2cad930
--- /dev/null
+++ b/tests/src/Regressions/common/project.lock.json
@@ -0,0 +1,840 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Collections/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Collections.dll": {}
+        }
+      },
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Globalization.dll": {}
+        }
+      },
+      "System.Globalization.Calendars/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.Calendars.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Globalization.Calendars.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Threading.Overlapped": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.FileSystem.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Overlapped/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Overlapped.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Overlapped.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Thread/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Thread.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Thread.dll": {}
+        }
+      },
+      "System.Threading.Timer/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Timer.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Timer.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Collections/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "2ISUf3MQt7JbeT6kXg36qY3fnkjykPXccHcBP0qyTc5vEjbLihC7KCxkHPFJWteKR8lvvSF3+8ES5J34VqezmQ==",
+      "files": [
+        "System.Collections.4.0.10-beta-23024.nupkg",
+        "System.Collections.4.0.10-beta-23024.nupkg.sha512",
+        "System.Collections.nuspec",
+        "lib/DNXCore50/System.Collections.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Collections.dll",
+        "ref/dotnet/System.Collections.dll",
+        "ref/dotnet/System.Collections.xml",
+        "ref/dotnet/de/System.Collections.xml",
+        "ref/dotnet/es/System.Collections.xml",
+        "ref/dotnet/fr/System.Collections.xml",
+        "ref/dotnet/it/System.Collections.xml",
+        "ref/dotnet/ja/System.Collections.xml",
+        "ref/dotnet/ko/System.Collections.xml",
+        "ref/dotnet/ru/System.Collections.xml",
+        "ref/dotnet/zh-hans/System.Collections.xml",
+        "ref/dotnet/zh-hant/System.Collections.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Collections.dll"
+      ]
+    },
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.10-beta-23024": {
+      "sha512": "RROZnwQ8phf5Sbb6h8rdnQCoppfKdWKmQ4CiWfvpbRG5XwWbVrMyZsBYazLTQ59MFXe8RXYHgHvE9OfnZPTCLQ==",
+      "files": [
+        "System.Globalization.4.0.10-beta-23024.nupkg",
+        "System.Globalization.4.0.10-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/DNXCore50/System.Globalization.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Globalization.dll"
+      ]
+    },
+    "System.Globalization.Calendars/4.0.0-beta-23024": {
+      "sha512": "2RC9/SZGrddxhOIWcRxHHi8YFsq9Av9znHKVgEu+cJe4Wt67b79i1GVXawcIu/Uu+XORmQKNT+V8PO86Jjligg==",
+      "files": [
+        "System.Globalization.Calendars.4.0.0-beta-23024.nupkg",
+        "System.Globalization.Calendars.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.Calendars.nuspec",
+        "lib/DNXCore50/System.Globalization.Calendars.dll",
+        "lib/net46/System.Globalization.Calendars.dll",
+        "lib/netcore50/System.Globalization.Calendars.dll",
+        "ref/dotnet/System.Globalization.Calendars.dll",
+        "ref/dotnet/System.Globalization.Calendars.xml",
+        "ref/dotnet/de/System.Globalization.Calendars.xml",
+        "ref/dotnet/es/System.Globalization.Calendars.xml",
+        "ref/dotnet/fr/System.Globalization.Calendars.xml",
+        "ref/dotnet/it/System.Globalization.Calendars.xml",
+        "ref/dotnet/ja/System.Globalization.Calendars.xml",
+        "ref/dotnet/ko/System.Globalization.Calendars.xml",
+        "ref/dotnet/ru/System.Globalization.Calendars.xml",
+        "ref/dotnet/zh-hans/System.Globalization.Calendars.xml",
+        "ref/dotnet/zh-hant/System.Globalization.Calendars.xml",
+        "ref/net46/System.Globalization.Calendars.dll",
+        "runtimes/win8-aot/lib/netcore50/System.Globalization.Calendars.dll"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CUlwZ5kM4QRQgsVj9/QQIr86hLr7U/E6evFXg6643qd63BppdfORu46tyQMxS/gsdrT4PiIRu7rrrguXiBR5ww==",
+      "files": [
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.nuspec",
+        "lib/DNXCore50/System.IO.FileSystem.dll",
+        "lib/net46/System.IO.FileSystem.dll",
+        "lib/netcore50/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.xml",
+        "ref/dotnet/de/System.IO.FileSystem.xml",
+        "ref/dotnet/es/System.IO.FileSystem.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.xml",
+        "ref/dotnet/it/System.IO.FileSystem.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.xml",
+        "ref/net46/System.IO.FileSystem.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.10-beta-23024": {
+      "sha512": "Ky5yclJBgNu+NArFSblpe2FZ/IeLeOYLIP8hLBwTiVDRufjWDqPKcPtETfnmyZq61HGyhTJWFd1uEkhDOgxF9g==",
+      "files": [
+        "System.Reflection.4.0.10-beta-23024.nupkg",
+        "System.Reflection.4.0.10-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/DNXCore50/System.Reflection.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.dll"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Overlapped/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "i5FkjE3Y++zufCyS68xiq8t/lwPyS2+urpv0MZUOID0pggCpqJiUGV5bnJRBo9Da79rpnVeFBleDOVFCnr2lrw==",
+      "files": [
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg",
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Overlapped.nuspec",
+        "lib/DNXCore50/System.Threading.Overlapped.dll",
+        "lib/net46/System.Threading.Overlapped.dll",
+        "lib/netcore50/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.xml",
+        "ref/dotnet/de/System.Threading.Overlapped.xml",
+        "ref/dotnet/es/System.Threading.Overlapped.xml",
+        "ref/dotnet/fr/System.Threading.Overlapped.xml",
+        "ref/dotnet/it/System.Threading.Overlapped.xml",
+        "ref/dotnet/ja/System.Threading.Overlapped.xml",
+        "ref/dotnet/ko/System.Threading.Overlapped.xml",
+        "ref/dotnet/ru/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hans/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hant/System.Threading.Overlapped.xml",
+        "ref/net46/System.Threading.Overlapped.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Thread/4.0.0-beta-23024": {
+      "sha512": "aeok537DgipEVRaoFjfYFf5MAyKm6eXKQQibvvHDertRXx+h1a7sIxt+K9QEHbjxDeKC+06orbGMlasNPSLxHA==",
+      "files": [
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg",
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Thread.nuspec",
+        "lib/DNXCore50/System.Threading.Thread.dll",
+        "lib/net46/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.xml",
+        "ref/dotnet/de/System.Threading.Thread.xml",
+        "ref/dotnet/es/System.Threading.Thread.xml",
+        "ref/dotnet/fr/System.Threading.Thread.xml",
+        "ref/dotnet/it/System.Threading.Thread.xml",
+        "ref/dotnet/ja/System.Threading.Thread.xml",
+        "ref/dotnet/ko/System.Threading.Thread.xml",
+        "ref/dotnet/ru/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hans/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hant/System.Threading.Thread.xml",
+        "ref/net46/System.Threading.Thread.dll"
+      ]
+    },
+    "System.Threading.Timer/4.0.0-beta-23024": {
+      "sha512": "pW32g5FObA1DhI5rAEk9zb8zp3MdJ0iiWy3uE3bvBepDa9lwYVe5nK5RCom7vTmvXU0zPckYYUoGptpv2L+tpA==",
+      "files": [
+        "System.Threading.Timer.4.0.0-beta-23024.nupkg",
+        "System.Threading.Timer.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Timer.nuspec",
+        "lib/DNXCore50/System.Threading.Timer.dll",
+        "lib/net451/_._",
+        "lib/netcore50/System.Threading.Timer.dll",
+        "lib/win81/_._",
+        "ref/dotnet/System.Threading.Timer.dll",
+        "ref/dotnet/System.Threading.Timer.xml",
+        "ref/dotnet/de/System.Threading.Timer.xml",
+        "ref/dotnet/es/System.Threading.Timer.xml",
+        "ref/dotnet/fr/System.Threading.Timer.xml",
+        "ref/dotnet/it/System.Threading.Timer.xml",
+        "ref/dotnet/ja/System.Threading.Timer.xml",
+        "ref/dotnet/ko/System.Threading.Timer.xml",
+        "ref/dotnet/ru/System.Threading.Timer.xml",
+        "ref/dotnet/zh-hans/System.Threading.Timer.xml",
+        "ref/dotnet/zh-hant/System.Threading.Timer.xml",
+        "ref/net451/_._",
+        "ref/netcore50/System.Threading.Timer.dll",
+        "ref/netcore50/System.Threading.Timer.xml",
+        "ref/win81/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Timer.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Threading >= 4.0.0-beta-*",
+      "System.Threading.Thread >= 4.0.0-beta-*",
+      "System.IO.FileSystem >= 4.0.0-beta-*",
+      "System.IO.FileSystem.Primitives >= 4.0.0-beta-*",
+      "System.Reflection >= 4.0.10-beta-*",
+      "System.Runtime.InteropServices >= 4.0.20-beta-*",
+      "System.Collections >= 4.0.10-beta-*",
+      "System.Globalization.Calendars >= 4.0.0-beta-*",
+      "System.Globalization >= 4.0.10-beta-*",
+      "System.Threading.Timer >= 4.0.0-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Regressions/common/regressions-common.csproj b/tests/src/Regressions/common/regressions-common.csproj
index f9d30c7..e306057 100644 (file)
--- a/tests/src/Regressions/common/regressions-common.csproj
+++ b/tests/src/Regressions/common/regressions-common.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{4C9D5390-1B91-41B8-89CE-117F2D80E752}</ProjectGuid>
@@ -10,6 +10,9 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
   <Target Name="Build">
     <ItemGroup>
       <AllSourceFiles Include="$(MSBuildProjectDirectory)\*.cs" />
@@ -18,6 +21,6 @@
     <PropertyGroup>
       <GenerateRunScript>false</GenerateRunScript>
     </PropertyGroup>
-    <MSBuild Projects="cs_template.proj" Properties="AssemblyName1=%(AllSourceFiles.FileName);AllowUnsafeBlocks=True;IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" Condition="'@(AllSourceFiles)' != ''" />
+    <MSBuild Projects="cs_template.csproj" Properties="AssemblyName1=%(AllSourceFiles.FileName);AllowUnsafeBlocks=True;IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" Condition="'@(AllSourceFiles)' != ''" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Regressions/expl_double/expl_double.csproj b/tests/src/Regressions/expl_double/expl_double.csproj
index 0a91954..2689891 100644 (file)
--- a/tests/src/Regressions/expl_double/expl_double.csproj
+++ b/tests/src/Regressions/expl_double/expl_double.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -33,8 +33,8 @@
     <Compile Include="body_double.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Regressions/expl_double/packages.config b/tests/src/Regressions/expl_double/packages.config
deleted file mode 100644 (file)
index 62d801f..0000000
--- a/tests/src/Regressions/expl_double/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-</packages>

diff --git a/tests/src/Regressions/expl_double/project.json b/tests/src/Regressions/expl_double/project.json
new file mode 100644 (file)
index 0000000..47433cd
--- /dev/null
+++ b/tests/src/Regressions/expl_double/project.json
@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Regressions/expl_double/project.lock.json b/tests/src/Regressions/expl_double/project.lock.json
new file mode 100644 (file)
index 0000000..9eb613b
--- /dev/null
+++ b/tests/src/Regressions/expl_double/project.lock.json
@@ -0,0 +1,575 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "uoRg44bzPk9KE9Sg6rLZmGfUmFZBDc7y25692VYna/WW3Smip/aGX0ESXyuNvWA8k8oXdV4Z/M4ZKdB3ahtdDw==",
+      "files": [
+        "System.Threading.4.0.10-beta-23024.nupkg",
+        "System.Threading.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/DNXCore50/System.Threading.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.dll",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Tests/packages.config b/tests/src/Tests/packages.config
deleted file mode 100644 (file)
index ca02a29..0000000
--- a/tests/src/Tests/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="xunit" version="2.0.0-beta5-build2785" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0-beta5-build2785" targetFramework="net45" />
-  <package id="xunit.assert" version="2.0.0-beta5-build2785" targetFramework="net45" />
-  <package id="xunit.core" version="2.0.0-beta5-build2785" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="0.99.9-build1021" targetFramework="net45" />
-  <package id="xunit.runners" version="2.0.0-beta5-build2785" />
-</packages>

diff --git a/tests/src/Threading/ThreadStatics/ThreadStatics.csproj b/tests/src/Threading/ThreadStatics/ThreadStatics.csproj
index b967f7c..b82e8b3 100644 (file)
--- a/tests/src/Threading/ThreadStatics/ThreadStatics.csproj
+++ b/tests/src/Threading/ThreadStatics/ThreadStatics.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
@@ -7,15 +7,18 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
   <Target Name="Build">
     <ItemGroup>
       <AllSourceFiles Include="$(MSBuildProjectDirectory)\*.cs" />
     </ItemGroup>
     <Message Text=" Files to be compiled are : @(AllSourceFiles)" />
     <PropertyGroup>
-         <ProjectGuid>{5B8CD92B-4F19-45B0-BB68-D545AAE09590}</ProjectGuid>
+      <ProjectGuid>{5B8CD92B-4F19-45B0-BB68-D545AAE09590}</ProjectGuid>
       <GenerateRunScript>false</GenerateRunScript>
     </PropertyGroup>
-    <MSBuild Projects="cs_template.proj" Properties="AssemblyName1=%(AllSourceFiles.FileName);IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" Condition="'@(AllSourceFiles)' != ''" />
+    <MSBuild Projects="cs_template.csproj" Properties="AssemblyName1=%(AllSourceFiles.FileName);IntermediateOutputPath=$(IntermediateOutputPath)\%(AllSourceFiles.FileName)\" Condition="'@(AllSourceFiles)' != ''" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Loader/regressions/classloader/cs_template.proj b/tests/src/Threading/ThreadStatics/cs_template.csproj
similarity index 87%
rename from tests/src/Loader/regressions/classloader/cs_template.proj
rename to tests/src/Threading/ThreadStatics/cs_template.csproj
index adc2f21..fc31cd9 100644 (file)
--- a/tests/src/Loader/regressions/classloader/cs_template.proj
+++ b/tests/src/Threading/ThreadStatics/cs_template.csproj
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -30,13 +30,13 @@
     <Compile Include="$(AssemblyName1).cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

diff --git a/tests/src/Threading/ThreadStatics/packages.config b/tests/src/Threading/ThreadStatics/packages.config
deleted file mode 100644 (file)
index 8f8ccd4..0000000
--- a/tests/src/Threading/ThreadStatics/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-    <package id="System.Console" version="4.0.0-beta-22405" />
-    <package id="System.Runtime" version="4.0.20-beta-22405" />
-    <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-    <package id="System.Threading" version="4.0.0-beta-22412" />
-    <package id="System.Threading.Thread" version="4.0.0-beta-22512" />
-</packages>

diff --git a/tests/src/Threading/ThreadStatics/project.json b/tests/src/Threading/ThreadStatics/project.json
new file mode 100644 (file)
index 0000000..4f41043
--- /dev/null
+++ b/tests/src/Threading/ThreadStatics/project.json
@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+    "System.Threading.Thread": "4.0.0-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/Threading/ThreadStatics/project.lock.json b/tests/src/Threading/ThreadStatics/project.lock.json
new file mode 100644 (file)
index 0000000..b542774
--- /dev/null
+++ b/tests/src/Threading/ThreadStatics/project.lock.json
@@ -0,0 +1,654 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Globalization/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Thread/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Thread.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Thread.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Globalization/4.0.0-beta-23024": {
+      "sha512": "spLUZdsogiGRrw0J/WPrayNmvrKO9luR3SewdrW6Khw2Jc3K5dVTlF75d7oRHAQ7zELn37/Pvb66ASFuJg835g==",
+      "files": [
+        "License.rtf",
+        "System.Globalization.4.0.0-beta-23024.nupkg",
+        "System.Globalization.4.0.0-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Globalization.dll",
+        "ref/netcore50/System.Globalization.xml",
+        "ref/netcore50/de/System.Globalization.xml",
+        "ref/netcore50/es/System.Globalization.xml",
+        "ref/netcore50/fr/System.Globalization.xml",
+        "ref/netcore50/it/System.Globalization.xml",
+        "ref/netcore50/ja/System.Globalization.xml",
+        "ref/netcore50/ko/System.Globalization.xml",
+        "ref/netcore50/ru/System.Globalization.xml",
+        "ref/netcore50/zh-hans/System.Globalization.xml",
+        "ref/netcore50/zh-hant/System.Globalization.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Thread/4.0.0-beta-23024": {
+      "sha512": "aeok537DgipEVRaoFjfYFf5MAyKm6eXKQQibvvHDertRXx+h1a7sIxt+K9QEHbjxDeKC+06orbGMlasNPSLxHA==",
+      "files": [
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg",
+        "System.Threading.Thread.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Thread.nuspec",
+        "lib/DNXCore50/System.Threading.Thread.dll",
+        "lib/net46/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.dll",
+        "ref/dotnet/System.Threading.Thread.xml",
+        "ref/dotnet/de/System.Threading.Thread.xml",
+        "ref/dotnet/es/System.Threading.Thread.xml",
+        "ref/dotnet/fr/System.Threading.Thread.xml",
+        "ref/dotnet/it/System.Threading.Thread.xml",
+        "ref/dotnet/ja/System.Threading.Thread.xml",
+        "ref/dotnet/ko/System.Threading.Thread.xml",
+        "ref/dotnet/ru/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hans/System.Threading.Thread.xml",
+        "ref/dotnet/zh-hant/System.Threading.Thread.xml",
+        "ref/net46/System.Threading.Thread.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Threading >= 4.0.0-beta-*",
+      "System.Threading.Thread >= 4.0.0-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/dir.props b/tests/src/dir.props
index 123ba70..1d46bcd 100644 (file)
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -7,6 +7,9 @@
     <NoExplicitReferenceToStdLib>true</NoExplicitReferenceToStdLib>
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <!-- Disable some C# warnings for the tests. -->
+    <NoWarn>78,162,164,168,169,219,251,252,414,429,642,649,652,675,1691,1717,1718,3001,3002,3003,3005,3008</NoWarn>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <!-- Enable alternative JIT for testing if specified -->

diff --git a/tests/src/dir.targets b/tests/src/dir.targets
index 677d3d9..d874ce0 100644 (file)
--- a/tests/src/dir.targets
+++ b/tests/src/dir.targets
@@ -1,60 +1,30 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <PropertyGroup Condition="'$(TargetFrameworkVersion)' != '' and '$(TargetFrameworkProfile)' != ''">
-    <TargetingPortable>true</TargetingPortable>
+  <PropertyGroup>
+    <ErrorIfBuildToolsRestoredFromIndividualProject Condition="!Exists('$(ToolsDir)')">true</ErrorIfBuildToolsRestoredFromIndividualProject>
   </PropertyGroup>
-
-  <!-- Setup the default target for projects not already explicitly targeting portable -->
-  <PropertyGroup Condition="'$(TargetingPortable)' != 'true'">
-    <!-- Setting a default portable profile, although nothing should resolve from there as we BuildProjectDir to use the pacakge refs -->
-    <TargetPlatformIdentifier>Portable</TargetPlatformIdentifier>
-    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile Condition="'$(TargetFrameworkProfile)' == ''">Profile7</TargetFrameworkProfile>
-    <TargetFrameworkMonikerDisplayName>.NET Portable Subset</TargetFrameworkMonikerDisplayName>
-    <ImplicitlyExpandTargetFramework Condition="'$(ImplicitlyExpandTargetFramework)' == ''">false</ImplicitlyExpandTargetFramework>
-
-    <AssemblySearchPaths>
-      {HintPathFromItem};
-      $(OutDir);
-      {RawFileName};
-    </AssemblySearchPaths>
-    <!-- For our projects we don't BuildProjectDir to resolve from the usual paths for now only hint paths and output directory 
-      {CandidateAssemblyFiles};
-      $(ReferencePath);
-      {TargetFrameworkDirectory};
-      {Registry:$(FrameworkRegistryBase),$(TargetFrameworkVersion),$(AssemblyFoldersSuffix)$(AssemblyFoldersExConditions)};
-    -->
+  
+  <Import Project="..\dir.targets" />
+  
+  <Import Project="$(ToolsDir)Build.Common.targets" Condition="Exists('$(ToolsDir)Build.Common.targets')" />
+  <Import Project="..\override.targets" Condition="Exists('..\override.targets')"/>
+
+  <!-- We enable auto-unification of assembly references after importing the common targets.  Binding redirects are not needed
+       for coreclr since it auto-unifies, so the warnings we get without this setting are just noise -->
+  <PropertyGroup>
+    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
   </PropertyGroup>
 
-  <!-- Need to add references to the mscorlib design-time facade for some old-style portable dependencies like xunit -->
-  <Target Name="AddDesignTimeFacadeReferences"
-      Condition="'$(TargetingPortable)' != 'true'"
-      BeforeTargets="ResolveReferences"
-      DependsOnTargets="GetReferenceAssemblyPaths"
-  >
-    <ItemGroup>
-      <PossibleTargetFrameworks Include="$(_TargetFrameworkDirectories)" />
-      <ReferencePath Condition="'$(LinkLocalMscorlib)' != 'true'" Include="%(PossibleTargetFrameworks.Identity)mscorlib.dll" />
-      <ReferencePath Condition="'$(LinkLocalMscorlib)' == 'true'" Include="$(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType)\mscorlib.dll" />
-    </ItemGroup>
-  </Target>
-
   <!-- Project language -->
+  <!-- TODO: This might just be the Language property -->
   <PropertyGroup Condition="'$(ProjectLanguage)' == ''">
     <ProjectLanguage Condition="'$(MSBuildProjectExtension)' == '.ilproj' OR '$(Language)' == 'IL'">IL</ProjectLanguage>
     <ProjectLanguage Condition="'$(MSBuildProjectExtension)' == '.csproj' OR '$(Language)' == 'C#' OR '$(ProjectLanguage)'==''">CSharp</ProjectLanguage>
   </PropertyGroup>
-
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" Condition="'$(ProjectLanguage)' == 'CSharp'" />
-
+  
   <!-- TODO (#1122): import this from the ToolsDir once it becomes available -->
   <Import Project="$(ProjectDir)src\IL.targets" Condition="'$(ProjectLanguage)' == 'IL'" />
 
-  <Import Project="$(ToolsDir)packageresolve.targets" Condition="Exists('$(ToolsDir)packageresolve.targets')" />
-
-  <Import Project="$(ToolsDir)sign.targets" Condition="Exists('$(ToolsDir)sign.targets')" />
-
   <PropertyGroup>
     <GenerateRunScript Condition="'$(OutputType.ToUpper())' != 'EXE' And '$(GenerateRunScript)' == ''">false</GenerateRunScript>
   </PropertyGroup>

diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj
index c7df88c..e00dfef 100644 (file)
--- a/tests/src/dirs.proj
+++ b/tests/src/dirs.proj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" InitialTargets="RestoreAllPackages;VerifyBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" InitialTargets="VerifyBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="dir.props" />
 
   <Target Name="VerifyBuildTools" 
@@ -12,17 +12,12 @@
     <Warning Text="Looks like there may be an update to the build tools. Please run buildtest.cmd from the root of the repo to refresh the build tools." /> 
   </Target>
 
-  <Import Project="$(ToolsDir)depending.targets" Condition="Exists('$(ToolsDir)depending.targets')" />
-  <Target Name="RestoreAllPackages">
-    <Message Importance="High" Text="Restoring all package dependencies..." />
-    <CallTarget Targets="EnsureDependencies" />
-  </Target>
-
-
-  <Target Name="ResolveDisabledProjects" BeforeTargets="BuildAllProjects" DependsOnTargets="RestoreAllPackages" >
+  <Target Name="ResolveDisabledProjects" BeforeTargets="BuildAllProjects" >
     <ItemGroup>
       <DisabledProjects Include="TestWrappers*\*\*.csproj" />
+      <DisabledProjects Include="*\**\cs_template.csproj" />
     </ItemGroup>
+    
     <ItemGroup>
       <Project Include="*\**\*.csproj" Exclude="@(DisabledProjects)"/>
       <Project Include="*\**\*.ilproj" Exclude="@(DisabledProjects)"/>

diff --git a/tests/src/managed/Compilation/Compilation.csproj b/tests/src/managed/Compilation/Compilation.csproj
index d40546f..e78cf66 100644 (file)
--- a/tests/src/managed/Compilation/Compilation.csproj
+++ b/tests/src/managed/Compilation/Compilation.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -13,7 +13,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
@@ -36,11 +36,11 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="app.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/tests/src/managed/Compilation/packages.config b/tests/src/managed/Compilation/packages.config
deleted file mode 100644 (file)
index 8566104..0000000
--- a/tests/src/managed/Compilation/packages.config
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.Console" version="4.0.0-beta-22405" />
-  <package id="System.Runtime" version="4.0.20-beta-22405" />
-  <package id="System.Collections" version="4.0.10-beta-22512" />
-  <package id="System.Collections.Concurrent" version="4.0.10-beta-22416" />
-  <package id="System.IO" version="4.0.10-beta-22412" />
-  <package id="System.IO.FileSystem" version="4.0.0-beta-22412" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.0-beta-22412" />
-  <package id="System.Text.Encoding" version="4.0.10-beta-22512" />
-  <package id="System.Threading" version="4.0.0-beta-22412" />
-  <package id="System.Threading.Tasks" version="4.0.10-beta-22412" />
-  <package id="System.Runtime.Handles" version="4.0.0-beta-22412" />
-  <package id="System.Threading.ThreadPool" version="4.0.10-beta-22416" />
-  <package id="System.Threading.Overlapped" version="4.0.0-beta-22416" />
-  <package id="System.Dynamic.Runtime" version="4.0.0-beta-22416" />
-  <package id="System.Threading.Tasks.Parallel" version="4.0.0-beta-22416" />
-  <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-
-  <package id="Microsoft.CodeAnalysis" version="1.0.0.0-beta2" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0.0-beta2" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0.0-beta2" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0.0-beta2" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0.0-beta2" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0.0-beta2" targetFramework="net45" />
-  <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
-  <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
-</packages>

diff --git a/tests/src/managed/Compilation/project.json b/tests/src/managed/Compilation/project.json
new file mode 100644 (file)
index 0000000..5d08b94
--- /dev/null
+++ b/tests/src/managed/Compilation/project.json
@@ -0,0 +1,32 @@
+{
+  "dependencies": {
+    "System.Console": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Collections": "4.0.10-beta-*",
+    "System.Collections.Concurrent": "4.0.10-beta-*",
+    "System.IO": "4.0.10-beta-*",
+    "System.IO.FileSystem": "4.0.0-beta-*",
+    "System.IO.FileSystem.Primitives": "4.0.0-beta-*",
+    "System.Text.Encoding": "4.0.10-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+    "System.Threading.Tasks": "4.0.10-beta-*",
+    "System.Runtime.Handles": "4.0.0-beta-*",
+    "System.Threading.ThreadPool": "4.0.10-beta-*",
+    "System.Threading.Overlapped": "4.0.0-beta-*",
+    "System.Dynamic.Runtime": "4.0.10-beta-*",
+    "System.Threading.Tasks.Parallel": "4.0.0-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "Microsoft.CodeAnalysis": "1.0.0.0-beta2",
+    "Microsoft.CodeAnalysis.Common": "1.0.0.0-beta2",
+    "Microsoft.CodeAnalysis.CSharp": "1.0.0.0-beta2",
+    "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.0.0.0-beta2",
+    "Microsoft.CodeAnalysis.VisualBasic": "1.0.0.0-beta2",
+    "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "1.0.0.0-beta2",
+    "Microsoft.CodeAnalysis.Workspaces.Common": "1.0.0.0-beta2",
+    "System.Collections.Immutable": "1.1.32-beta",
+    "System.Reflection.Metadata": "1.0.17-beta"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
\ No newline at end of file

diff --git a/tests/src/managed/Compilation/project.lock.json b/tests/src/managed/Compilation/project.lock.json
new file mode 100644 (file)
index 0000000..bad9774
--- /dev/null
+++ b/tests/src/managed/Compilation/project.lock.json
@@ -0,0 +1,1502 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "Microsoft.CodeAnalysis/1.0.0.0-beta2": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.CSharp.Workspaces": "[1.0.0.0-beta2]",
+          "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "[1.0.0.0-beta2]"
+        }
+      },
+      "Microsoft.CodeAnalysis.Common/1.0.0.0-beta2": {
+        "dependencies": {
+          "System.Collections.Immutable": "[1.1.32-beta]",
+          "System.Reflection.Metadata": "[1.0.17-beta]"
+        },
+        "compile": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.dll": {}
+        }
+      },
+      "Microsoft.CodeAnalysis.CSharp/1.0.0.0-beta2": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.Common": "[1.0.0.0-beta2]"
+        },
+        "compile": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.CSharp.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.CSharp.dll": {}
+        }
+      },
+      "Microsoft.CodeAnalysis.CSharp.Workspaces/1.0.0.0-beta2": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.CSharp": "[1.0.0.0-beta2]",
+          "Microsoft.CodeAnalysis.Workspaces.Common": "[1.0.0.0-beta2]"
+        },
+        "compile": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.CSharp.Workspaces.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.CSharp.Workspaces.dll": {}
+        }
+      },
+      "Microsoft.CodeAnalysis.VisualBasic/1.0.0.0-beta2": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.Common": "1.0.0.0-beta2"
+        },
+        "compile": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.VisualBasic.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.VisualBasic.dll": {}
+        }
+      },
+      "Microsoft.CodeAnalysis.VisualBasic.Workspaces/1.0.0.0-beta2": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.VisualBasic": "[1.0.0.0-beta2]",
+          "Microsoft.CodeAnalysis.Workspaces.Common": "[1.0.0.0-beta2]"
+        },
+        "compile": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll": {}
+        }
+      },
+      "Microsoft.CodeAnalysis.Workspaces.Common/1.0.0.0-beta2": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.Common": "[1.0.0.0-beta2]"
+        },
+        "compile": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.Workspaces.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8/Microsoft.CodeAnalysis.Workspaces.dll": {}
+        }
+      },
+      "System.Collections/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Collections.dll": {}
+        }
+      },
+      "System.Collections.Concurrent/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Diagnostics.Tracing": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.Concurrent.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Collections.Concurrent.dll": {}
+        }
+      },
+      "System.Collections.Immutable/1.1.32-beta": {
+        "compile": {
+          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
+        }
+      },
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Diagnostics.Debug/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Debug.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Debug.dll": {}
+        }
+      },
+      "System.Diagnostics.Tracing/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Tracing.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Tracing.dll": {}
+        }
+      },
+      "System.Dynamic.Runtime/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Collections": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Reflection.Emit": "4.0.0-beta-23024",
+          "System.ObjectModel": "4.0.0-beta-23024",
+          "System.Threading": "4.0.0-beta-23024",
+          "System.Reflection.TypeExtensions": "4.0.0-beta-23024",
+          "System.Runtime.Extensions": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024",
+          "System.Linq": "4.0.0-beta-23024",
+          "System.Linq.Expressions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Dynamic.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Dynamic.Runtime.dll": {}
+        }
+      },
+      "System.Globalization/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Threading.Overlapped": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.FileSystem.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Linq/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Linq.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Linq.dll": {}
+        }
+      },
+      "System.Linq.Expressions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Collections": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.TypeExtensions": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Reflection.Emit": "4.0.0-beta-23024",
+          "System.ObjectModel": "4.0.0-beta-23024",
+          "System.Threading": "4.0.0-beta-23024",
+          "System.Runtime.Extensions": "4.0.0-beta-23024",
+          "System.Linq": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024",
+          "System.Reflection.Extensions": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Linq.Expressions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Linq.Expressions.dll": {}
+        }
+      },
+      "System.ObjectModel/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.ObjectModel.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Emit/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Emit.ILGeneration": "4.0.0-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Emit.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Emit.dll": {}
+        }
+      },
+      "System.Reflection.Emit.ILGeneration/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Emit.ILGeneration.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Emit.ILGeneration.dll": {}
+        }
+      },
+      "System.Reflection.Extensions/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Extensions.dll": {}
+        }
+      },
+      "System.Reflection.Metadata/1.0.17-beta": {
+        "dependencies": {
+          "System.Collections.Immutable": "1.1.32-beta"
+        },
+        "compile": {
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
+        },
+        "runtime": {
+          "lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Reflection.TypeExtensions/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.TypeExtensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.TypeExtensions.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Overlapped/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Overlapped.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Overlapped.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.Tasks.Parallel/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Collections.Concurrent": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Diagnostics.Tracing": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.Parallel.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Threading.Tasks.Parallel.dll": {}
+        }
+      },
+      "System.Threading.ThreadPool/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.InteropServices": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.ThreadPool.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.ThreadPool.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "Microsoft.CodeAnalysis/1.0.0.0-beta2": {
+      "sha512": "xLX8zM+hKxSktBbpHCB5+NJVwhtVUqpA+2KEGk8VyyGS1zesXyzkfqfJfMuQO55qYrDR+rbsaqI38MraCnFWjw==",
+      "files": [
+        "Microsoft.CodeAnalysis.1.0.0.0-beta2.nupkg",
+        "Microsoft.CodeAnalysis.1.0.0.0-beta2.nupkg.sha512",
+        "Microsoft.CodeAnalysis.nuspec",
+        "ThirdPartyNotices.rtf"
+      ]
+    },
+    "Microsoft.CodeAnalysis.Common/1.0.0.0-beta2": {
+      "sha512": "JGx2+iwrOLZsWseUSbGuEMF9TVhuiiW/L541J+CeWZywLqhwy/mfuR96v0AsbPGEpzZjyegK52/OA4ob2fTwDg==",
+      "files": [
+        "Microsoft.CodeAnalysis.Common.1.0.0.0-beta2.nupkg",
+        "Microsoft.CodeAnalysis.Common.1.0.0.0-beta2.nupkg.sha512",
+        "Microsoft.CodeAnalysis.Common.nuspec",
+        "ThirdPartyNotices.rtf",
+        "lib/net45/Microsoft.CodeAnalysis.Desktop.dll",
+        "lib/net45/Microsoft.CodeAnalysis.Desktop.xml",
+        "lib/net45/Microsoft.CodeAnalysis.dll",
+        "lib/net45/Microsoft.CodeAnalysis.xml",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.dll",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.xml"
+      ]
+    },
+    "Microsoft.CodeAnalysis.CSharp/1.0.0.0-beta2": {
+      "sha512": "h6ZAonCRYCeqh9fZzwN9MdZ9Pi2bQESoJQuuWhe6kUkf2rESh/dSrX++dqa6nl1IouHzSgX8s+VMniM6jS5Rcg==",
+      "files": [
+        "Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2.nupkg",
+        "Microsoft.CodeAnalysis.CSharp.1.0.0.0-beta2.nupkg.sha512",
+        "Microsoft.CodeAnalysis.CSharp.nuspec",
+        "ThirdPartyNotices.rtf",
+        "lib/net45/Microsoft.CodeAnalysis.CSharp.Desktop.dll",
+        "lib/net45/Microsoft.CodeAnalysis.CSharp.Desktop.xml",
+        "lib/net45/Microsoft.CodeAnalysis.CSharp.dll",
+        "lib/net45/Microsoft.CodeAnalysis.CSharp.xml",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.CSharp.dll",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.CSharp.xml"
+      ]
+    },
+    "Microsoft.CodeAnalysis.CSharp.Workspaces/1.0.0.0-beta2": {
+      "sha512": "zUlOyjwWmmKV42THq5b/zT3azOZLYm7HS+h5u0/bYTWWsY/BtAYR9pewMlwPJTj7joG226i+HKXCYHtK6R/fCg==",
+      "files": [
+        "Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0.0-beta2.nupkg",
+        "Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0.0-beta2.nupkg.sha512",
+        "Microsoft.CodeAnalysis.CSharp.Workspaces.nuspec",
+        "ThirdPartyNotices.rtf",
+        "lib/net45/Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll",
+        "lib/net45/Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.xml",
+        "lib/net45/Microsoft.CodeAnalysis.CSharp.Workspaces.dll",
+        "lib/net45/Microsoft.CodeAnalysis.CSharp.Workspaces.xml",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.CSharp.Workspaces.dll",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.CSharp.Workspaces.xml"
+      ]
+    },
+    "Microsoft.CodeAnalysis.VisualBasic/1.0.0.0-beta2": {
+      "sha512": "W5fNJxUejSSQzjHYXhcwR4Jd9a2cvkbebr+AyPsKaUSRb2pM7k6TvsxRX1aY7Xrsprk1xu+YX15176grBoVmRg==",
+      "files": [
+        "Microsoft.CodeAnalysis.VisualBasic.1.0.0.0-beta2.nupkg",
+        "Microsoft.CodeAnalysis.VisualBasic.1.0.0.0-beta2.nupkg.sha512",
+        "Microsoft.CodeAnalysis.VisualBasic.nuspec",
+        "ThirdPartyNotices.rtf",
+        "lib/net45/Microsoft.CodeAnalysis.VisualBasic.Desktop.dll",
+        "lib/net45/Microsoft.CodeAnalysis.VisualBasic.Desktop.xml",
+        "lib/net45/Microsoft.CodeAnalysis.VisualBasic.dll",
+        "lib/net45/Microsoft.CodeAnalysis.VisualBasic.xml",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.VisualBasic.dll",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.VisualBasic.xml"
+      ]
+    },
+    "Microsoft.CodeAnalysis.VisualBasic.Workspaces/1.0.0.0-beta2": {
+      "sha512": "Z3CUVubd/M5/HzoVXTK/QwkPED+4rtnsRTotCYERqLU1zFpG0tEsf6qpJwJHwn5mL5VwwrULginvMH1obsX2EA==",
+      "files": [
+        "Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.0.0.0-beta2.nupkg",
+        "Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.0.0.0-beta2.nupkg.sha512",
+        "Microsoft.CodeAnalysis.VisualBasic.Workspaces.nuspec",
+        "ThirdPartyNotices.rtf",
+        "lib/net45/Microsoft.CodeAnalysis.VisualBasic.Workspaces.Desktop.dll",
+        "lib/net45/Microsoft.CodeAnalysis.VisualBasic.Workspaces.Desktop.xml",
+        "lib/net45/Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll",
+        "lib/net45/Microsoft.CodeAnalysis.VisualBasic.Workspaces.xml",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.VisualBasic.Workspaces.xml"
+      ]
+    },
+    "Microsoft.CodeAnalysis.Workspaces.Common/1.0.0.0-beta2": {
+      "sha512": "eUtO/cX2SHffwdozF/3cw3VcDCYP9lXFnkleO2oYOi8X1pz8qK2V/GVFu1P+IzkG5+0ZG5ZlJsoosMJPoTikhg==",
+      "files": [
+        "Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2.nupkg",
+        "Microsoft.CodeAnalysis.Workspaces.Common.1.0.0.0-beta2.nupkg.sha512",
+        "Microsoft.CodeAnalysis.Workspaces.Common.nuspec",
+        "ThirdPartyNotices.rtf",
+        "lib/net45/Microsoft.CodeAnalysis.Workspaces.Desktop.dll",
+        "lib/net45/Microsoft.CodeAnalysis.Workspaces.Desktop.xml",
+        "lib/net45/Microsoft.CodeAnalysis.Workspaces.dll",
+        "lib/net45/Microsoft.CodeAnalysis.Workspaces.xml",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.Workspaces.dll",
+        "lib/portable-net45+win8/Microsoft.CodeAnalysis.Workspaces.xml"
+      ]
+    },
+    "System.Collections/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "2ISUf3MQt7JbeT6kXg36qY3fnkjykPXccHcBP0qyTc5vEjbLihC7KCxkHPFJWteKR8lvvSF3+8ES5J34VqezmQ==",
+      "files": [
+        "System.Collections.4.0.10-beta-23024.nupkg",
+        "System.Collections.4.0.10-beta-23024.nupkg.sha512",
+        "System.Collections.nuspec",
+        "lib/DNXCore50/System.Collections.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Collections.dll",
+        "ref/dotnet/System.Collections.dll",
+        "ref/dotnet/System.Collections.xml",
+        "ref/dotnet/de/System.Collections.xml",
+        "ref/dotnet/es/System.Collections.xml",
+        "ref/dotnet/fr/System.Collections.xml",
+        "ref/dotnet/it/System.Collections.xml",
+        "ref/dotnet/ja/System.Collections.xml",
+        "ref/dotnet/ko/System.Collections.xml",
+        "ref/dotnet/ru/System.Collections.xml",
+        "ref/dotnet/zh-hans/System.Collections.xml",
+        "ref/dotnet/zh-hant/System.Collections.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Collections.dll"
+      ]
+    },
+    "System.Collections.Concurrent/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "yJtHT5QpsuoMDuOz552wi/2kodOdwvfyfBgAWSJP80/P+uIGdSer4k3x11lTv8RGgcwrnhFtClK4COvYDtDS0A==",
+      "files": [
+        "System.Collections.Concurrent.4.0.10-beta-23024.nupkg",
+        "System.Collections.Concurrent.4.0.10-beta-23024.nupkg.sha512",
+        "System.Collections.Concurrent.nuspec",
+        "lib/dotnet/System.Collections.Concurrent.dll",
+        "lib/net46/_._",
+        "ref/dotnet/System.Collections.Concurrent.dll",
+        "ref/dotnet/System.Collections.Concurrent.xml",
+        "ref/dotnet/de/System.Collections.Concurrent.xml",
+        "ref/dotnet/es/System.Collections.Concurrent.xml",
+        "ref/dotnet/fr/System.Collections.Concurrent.xml",
+        "ref/dotnet/it/System.Collections.Concurrent.xml",
+        "ref/dotnet/ja/System.Collections.Concurrent.xml",
+        "ref/dotnet/ko/System.Collections.Concurrent.xml",
+        "ref/dotnet/ru/System.Collections.Concurrent.xml",
+        "ref/dotnet/zh-hans/System.Collections.Concurrent.xml",
+        "ref/dotnet/zh-hant/System.Collections.Concurrent.xml",
+        "ref/net46/_._"
+      ]
+    },
+    "System.Collections.Immutable/1.1.32-beta": {
+      "serviceable": true,
+      "sha512": "ckfFUM6keywtdZ+DT7/KWSmQ0YRLHu4OCnKKWbumvO8uDcKtCoxjLKcaWNzguGCSTy2r2Ap9gojazgCwMYw0bQ==",
+      "files": [
+        "License-Stable.rtf",
+        "System.Collections.Immutable.1.1.32-beta.nupkg",
+        "System.Collections.Immutable.1.1.32-beta.nupkg.sha512",
+        "System.Collections.Immutable.nuspec",
+        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll",
+        "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml"
+      ]
+    },
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Diagnostics.Debug/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "dnfynhlmsMaRB/YvN5JifCdYYnRf/mTjFAAM1awp3wrjsgOSpAzOE4sxYX0hdY1FyAFTDcUnusQ+H3AMcF3Stw==",
+      "files": [
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg",
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Debug.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Debug.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.xml",
+        "ref/dotnet/de/System.Diagnostics.Debug.xml",
+        "ref/dotnet/es/System.Diagnostics.Debug.xml",
+        "ref/dotnet/fr/System.Diagnostics.Debug.xml",
+        "ref/dotnet/it/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ja/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ko/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ru/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Debug.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Debug.dll"
+      ]
+    },
+    "System.Diagnostics.Tracing/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "5HIUGXAmhZzF3EIHn+T+8B5NkV+2pMGGc7js1gPrlclrnlZpaZwjGGwL93pWJfc0RacFXo0wNYntWKMZl/WTVQ==",
+      "files": [
+        "System.Diagnostics.Tracing.4.0.20-beta-23024.nupkg",
+        "System.Diagnostics.Tracing.4.0.20-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Tracing.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Tracing.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Diagnostics.Tracing.dll",
+        "ref/dotnet/System.Diagnostics.Tracing.dll",
+        "ref/dotnet/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/de/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/es/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/fr/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/it/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/ja/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/ko/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/ru/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Tracing.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Tracing.dll"
+      ]
+    },
+    "System.Dynamic.Runtime/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "3CiMvB0locDLrxPaVJY4ZssiLUvTQaGU6WgQ7/TUfIJYZgeX1CMGEKj+RD7/kSiuv6IDhUiAIdoejNrATkgX2Q==",
+      "files": [
+        "runtime.json",
+        "System.Dynamic.Runtime.4.0.10-beta-23024.nupkg",
+        "System.Dynamic.Runtime.4.0.10-beta-23024.nupkg.sha512",
+        "System.Dynamic.Runtime.nuspec",
+        "lib/DNXCore50/System.Dynamic.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Dynamic.Runtime.dll",
+        "ref/dotnet/System.Dynamic.Runtime.dll",
+        "ref/dotnet/System.Dynamic.Runtime.xml",
+        "ref/dotnet/de/System.Dynamic.Runtime.xml",
+        "ref/dotnet/es/System.Dynamic.Runtime.xml",
+        "ref/dotnet/fr/System.Dynamic.Runtime.xml",
+        "ref/dotnet/it/System.Dynamic.Runtime.xml",
+        "ref/dotnet/ja/System.Dynamic.Runtime.xml",
+        "ref/dotnet/ko/System.Dynamic.Runtime.xml",
+        "ref/dotnet/ru/System.Dynamic.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Dynamic.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Dynamic.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Dynamic.Runtime.dll"
+      ]
+    },
+    "System.Globalization/4.0.10-beta-23024": {
+      "sha512": "RROZnwQ8phf5Sbb6h8rdnQCoppfKdWKmQ4CiWfvpbRG5XwWbVrMyZsBYazLTQ59MFXe8RXYHgHvE9OfnZPTCLQ==",
+      "files": [
+        "System.Globalization.4.0.10-beta-23024.nupkg",
+        "System.Globalization.4.0.10-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/DNXCore50/System.Globalization.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Globalization.dll"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CUlwZ5kM4QRQgsVj9/QQIr86hLr7U/E6evFXg6643qd63BppdfORu46tyQMxS/gsdrT4PiIRu7rrrguXiBR5ww==",
+      "files": [
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.nuspec",
+        "lib/DNXCore50/System.IO.FileSystem.dll",
+        "lib/net46/System.IO.FileSystem.dll",
+        "lib/netcore50/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.xml",
+        "ref/dotnet/de/System.IO.FileSystem.xml",
+        "ref/dotnet/es/System.IO.FileSystem.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.xml",
+        "ref/dotnet/it/System.IO.FileSystem.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.xml",
+        "ref/net46/System.IO.FileSystem.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Linq/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "hVGW083n8Lf5J0uFrDqbbeZODqcpqlTls42aVbJXkELEBfRFOYdC3elpPEw/gtlLsBIUFfYJgq+a/7Mqv/i//g==",
+      "files": [
+        "System.Linq.4.0.0-beta-23024.nupkg",
+        "System.Linq.4.0.0-beta-23024.nupkg.sha512",
+        "System.Linq.nuspec",
+        "lib/dotnet/System.Linq.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Linq.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Linq.dll",
+        "ref/dotnet/System.Linq.xml",
+        "ref/dotnet/de/System.Linq.xml",
+        "ref/dotnet/es/System.Linq.xml",
+        "ref/dotnet/fr/System.Linq.xml",
+        "ref/dotnet/it/System.Linq.xml",
+        "ref/dotnet/ja/System.Linq.xml",
+        "ref/dotnet/ko/System.Linq.xml",
+        "ref/dotnet/ru/System.Linq.xml",
+        "ref/dotnet/zh-hans/System.Linq.xml",
+        "ref/dotnet/zh-hant/System.Linq.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Linq.dll",
+        "ref/netcore50/System.Linq.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Linq.Expressions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "M00ZX4duEc5ON96skfTKUXiGp4/qD3sz2SGhbOxBlHoDXJ5Ax0iUZGCDGHK9s7Ncf60qYPghtO2qy/7LVHHjHA==",
+      "files": [
+        "runtime.json",
+        "System.Linq.Expressions.4.0.10-beta-23024.nupkg",
+        "System.Linq.Expressions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Linq.Expressions.nuspec",
+        "lib/DNXCore50/System.Linq.Expressions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Linq.Expressions.dll",
+        "ref/dotnet/System.Linq.Expressions.dll",
+        "ref/dotnet/System.Linq.Expressions.xml",
+        "ref/dotnet/de/System.Linq.Expressions.xml",
+        "ref/dotnet/es/System.Linq.Expressions.xml",
+        "ref/dotnet/fr/System.Linq.Expressions.xml",
+        "ref/dotnet/it/System.Linq.Expressions.xml",
+        "ref/dotnet/ja/System.Linq.Expressions.xml",
+        "ref/dotnet/ko/System.Linq.Expressions.xml",
+        "ref/dotnet/ru/System.Linq.Expressions.xml",
+        "ref/dotnet/zh-hans/System.Linq.Expressions.xml",
+        "ref/dotnet/zh-hant/System.Linq.Expressions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Linq.Expressions.dll"
+      ]
+    },
+    "System.ObjectModel/4.0.0-beta-23024": {
+      "sha512": "2hZj5Njj6scQ2yCVTghA6qBO9XXPm25JbkefJZbokdJtkNWvCArSdK/r3bX6cXqLESkrH/wublHqTztNMnB8Dw==",
+      "files": [
+        "License.rtf",
+        "System.ObjectModel.4.0.0-beta-23024.nupkg",
+        "System.ObjectModel.4.0.0-beta-23024.nupkg.sha512",
+        "System.ObjectModel.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.ObjectModel.dll",
+        "ref/dotnet/System.ObjectModel.xml",
+        "ref/dotnet/de/System.ObjectModel.xml",
+        "ref/dotnet/es/System.ObjectModel.xml",
+        "ref/dotnet/fr/System.ObjectModel.xml",
+        "ref/dotnet/it/System.ObjectModel.xml",
+        "ref/dotnet/ja/System.ObjectModel.xml",
+        "ref/dotnet/ko/System.ObjectModel.xml",
+        "ref/dotnet/ru/System.ObjectModel.xml",
+        "ref/dotnet/zh-hans/System.ObjectModel.xml",
+        "ref/dotnet/zh-hant/System.ObjectModel.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.ObjectModel.dll",
+        "ref/netcore50/System.ObjectModel.xml",
+        "ref/netcore50/de/System.ObjectModel.xml",
+        "ref/netcore50/es/System.ObjectModel.xml",
+        "ref/netcore50/fr/System.ObjectModel.xml",
+        "ref/netcore50/it/System.ObjectModel.xml",
+        "ref/netcore50/ja/System.ObjectModel.xml",
+        "ref/netcore50/ko/System.ObjectModel.xml",
+        "ref/netcore50/ru/System.ObjectModel.xml",
+        "ref/netcore50/zh-hans/System.ObjectModel.xml",
+        "ref/netcore50/zh-hant/System.ObjectModel.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.0-beta-23024": {
+      "sha512": "UmA+4UuB+4xIaP1ok9i+Jg2BV6rFKyX35puGZmnXQiaKFFEs9jMF0cInSrwAxbi1ggzuqoZ1gJo2mrmU+sMdkA==",
+      "files": [
+        "License.rtf",
+        "System.Reflection.4.0.0-beta-23024.nupkg",
+        "System.Reflection.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.dll",
+        "ref/netcore50/System.Reflection.xml",
+        "ref/netcore50/de/System.Reflection.xml",
+        "ref/netcore50/es/System.Reflection.xml",
+        "ref/netcore50/fr/System.Reflection.xml",
+        "ref/netcore50/it/System.Reflection.xml",
+        "ref/netcore50/ja/System.Reflection.xml",
+        "ref/netcore50/ko/System.Reflection.xml",
+        "ref/netcore50/ru/System.Reflection.xml",
+        "ref/netcore50/zh-hans/System.Reflection.xml",
+        "ref/netcore50/zh-hant/System.Reflection.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Reflection.Emit/4.0.0-beta-23024": {
+      "sha512": "VNrqiyCvlNoPLQIak1J1+PL6f7tN7Esn6HTmoWvLwSjyztV+CikHfAYv+jQRYEOPILfEgsPFS73sj4H49b/1qw==",
+      "files": [
+        "System.Reflection.Emit.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Emit.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Emit.nuspec",
+        "lib/DNXCore50/System.Reflection.Emit.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Emit.dll",
+        "ref/dotnet/System.Reflection.Emit.dll",
+        "ref/dotnet/System.Reflection.Emit.xml",
+        "ref/dotnet/de/System.Reflection.Emit.xml",
+        "ref/dotnet/es/System.Reflection.Emit.xml",
+        "ref/dotnet/fr/System.Reflection.Emit.xml",
+        "ref/dotnet/it/System.Reflection.Emit.xml",
+        "ref/dotnet/ja/System.Reflection.Emit.xml",
+        "ref/dotnet/ko/System.Reflection.Emit.xml",
+        "ref/dotnet/ru/System.Reflection.Emit.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Emit.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Emit.xml",
+        "ref/net45/_._"
+      ]
+    },
+    "System.Reflection.Emit.ILGeneration/4.0.0-beta-23024": {
+      "sha512": "p6QfhflZWlM7VEQMMaBZSJ1ntASpnnD/usgOfUO9EtBcXfYsav0BoIB++p1ih41Zt2iPG5DUv9aYnP+njQb/SQ==",
+      "files": [
+        "System.Reflection.Emit.ILGeneration.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Emit.ILGeneration.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Emit.ILGeneration.nuspec",
+        "lib/DNXCore50/System.Reflection.Emit.ILGeneration.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Emit.ILGeneration.dll",
+        "ref/dotnet/System.Reflection.Emit.ILGeneration.dll",
+        "ref/dotnet/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/de/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/es/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/fr/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/it/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/ja/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/ko/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/ru/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Emit.ILGeneration.xml",
+        "ref/net45/_._"
+      ]
+    },
+    "System.Reflection.Extensions/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "Hb/Jq24QyHQ563tCB8C7qu5MlOsCc3NSopzvWAf2pU0CN0LnWH1M5W30TnVERBFWo46TJih5+IxGYhjtUU3b3A==",
+      "files": [
+        "System.Reflection.Extensions.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Extensions.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Extensions.nuspec",
+        "lib/DNXCore50/System.Reflection.Extensions.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Extensions.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Extensions.dll",
+        "ref/dotnet/System.Reflection.Extensions.xml",
+        "ref/dotnet/de/System.Reflection.Extensions.xml",
+        "ref/dotnet/es/System.Reflection.Extensions.xml",
+        "ref/dotnet/fr/System.Reflection.Extensions.xml",
+        "ref/dotnet/it/System.Reflection.Extensions.xml",
+        "ref/dotnet/ja/System.Reflection.Extensions.xml",
+        "ref/dotnet/ko/System.Reflection.Extensions.xml",
+        "ref/dotnet/ru/System.Reflection.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Extensions.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Extensions.dll",
+        "ref/netcore50/System.Reflection.Extensions.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Extensions.dll"
+      ]
+    },
+    "System.Reflection.Metadata/1.0.17-beta": {
+      "serviceable": true,
+      "sha512": "PyXG0gfs9gDDj4Km2PKadmPOMsH7IL+S4zckKMESdgv34f0I063VKi+RgmZ8f4wtgBVQTw8UrYE911lpePFAgA==",
+      "files": [
+        "License-Stable.rtf",
+        "System.Reflection.Metadata.1.0.17-beta.nupkg",
+        "System.Reflection.Metadata.1.0.17-beta.nupkg.sha512",
+        "System.Reflection.Metadata.nuspec",
+        "lib/portable-net45+win8/System.Reflection.Metadata.dll",
+        "lib/portable-net45+win8/System.Reflection.Metadata.xml"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Reflection.TypeExtensions/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UTsspl61Om2E/x08euAQIrf5d6ebbx4YB8iLvtUrgYBV/iia81X6yMiRobUfYSNKu7WVAxwVrzxyPM8gDaA0rA==",
+      "files": [
+        "System.Reflection.TypeExtensions.4.0.0-beta-23024.nupkg",
+        "System.Reflection.TypeExtensions.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.TypeExtensions.nuspec",
+        "lib/DNXCore50/System.Reflection.TypeExtensions.dll",
+        "lib/net46/System.Reflection.TypeExtensions.dll",
+        "lib/netcore50/System.Reflection.TypeExtensions.dll",
+        "ref/dotnet/System.Reflection.TypeExtensions.dll",
+        "ref/dotnet/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/de/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/es/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/fr/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/it/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/ja/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/ko/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/ru/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/zh-hans/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/zh-hant/System.Reflection.TypeExtensions.xml",
+        "ref/net46/System.Reflection.TypeExtensions.dll",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.TypeExtensions.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Overlapped/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "i5FkjE3Y++zufCyS68xiq8t/lwPyS2+urpv0MZUOID0pggCpqJiUGV5bnJRBo9Da79rpnVeFBleDOVFCnr2lrw==",
+      "files": [
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg",
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Overlapped.nuspec",
+        "lib/DNXCore50/System.Threading.Overlapped.dll",
+        "lib/net46/System.Threading.Overlapped.dll",
+        "lib/netcore50/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.xml",
+        "ref/dotnet/de/System.Threading.Overlapped.xml",
+        "ref/dotnet/es/System.Threading.Overlapped.xml",
+        "ref/dotnet/fr/System.Threading.Overlapped.xml",
+        "ref/dotnet/it/System.Threading.Overlapped.xml",
+        "ref/dotnet/ja/System.Threading.Overlapped.xml",
+        "ref/dotnet/ko/System.Threading.Overlapped.xml",
+        "ref/dotnet/ru/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hans/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hant/System.Threading.Overlapped.xml",
+        "ref/net46/System.Threading.Overlapped.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.Tasks.Parallel/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "84n7zzzkC36X4WUb6K94L8KiEKrX9azLeV9eoLyOLpTPaGE0d0S6lVJjksWoMM80bt3ERvDwCC+drMxeeCugFA==",
+      "files": [
+        "System.Threading.Tasks.Parallel.4.0.0-beta-23024.nupkg",
+        "System.Threading.Tasks.Parallel.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.Parallel.nuspec",
+        "lib/dotnet/System.Threading.Tasks.Parallel.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Threading.Tasks.Parallel.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.Tasks.Parallel.dll",
+        "ref/dotnet/System.Threading.Tasks.Parallel.xml",
+        "ref/dotnet/de/System.Threading.Tasks.Parallel.xml",
+        "ref/dotnet/es/System.Threading.Tasks.Parallel.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.Parallel.xml",
+        "ref/dotnet/it/System.Threading.Tasks.Parallel.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.Parallel.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.Parallel.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.Parallel.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.Parallel.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.Parallel.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.Tasks.Parallel.dll",
+        "ref/netcore50/System.Threading.Tasks.Parallel.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.ThreadPool/4.0.10-beta-23024": {
+      "sha512": "ue4+ZEycLk4N5plLhBySK7oQLE+XotooYRbZnfwrXK6s61n9K1O8q1glGt7o8QJZbTfVYEjRG0Tk0jocYaTa2A==",
+      "files": [
+        "System.Threading.ThreadPool.4.0.10-beta-23024.nupkg",
+        "System.Threading.ThreadPool.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.ThreadPool.nuspec",
+        "lib/DNXCore50/System.Threading.ThreadPool.dll",
+        "lib/net46/System.Threading.ThreadPool.dll",
+        "ref/dotnet/System.Threading.ThreadPool.dll",
+        "ref/dotnet/System.Threading.ThreadPool.xml",
+        "ref/dotnet/de/System.Threading.ThreadPool.xml",
+        "ref/dotnet/es/System.Threading.ThreadPool.xml",
+        "ref/dotnet/fr/System.Threading.ThreadPool.xml",
+        "ref/dotnet/it/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ja/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ko/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ru/System.Threading.ThreadPool.xml",
+        "ref/dotnet/zh-hans/System.Threading.ThreadPool.xml",
+        "ref/dotnet/zh-hant/System.Threading.ThreadPool.xml",
+        "ref/net46/System.Threading.ThreadPool.dll"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "System.Console >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Collections >= 4.0.10-beta-*",
+      "System.Collections.Concurrent >= 4.0.10-beta-*",
+      "System.IO >= 4.0.10-beta-*",
+      "System.IO.FileSystem >= 4.0.0-beta-*",
+      "System.IO.FileSystem.Primitives >= 4.0.0-beta-*",
+      "System.Text.Encoding >= 4.0.10-beta-*",
+      "System.Threading >= 4.0.0-beta-*",
+      "System.Threading.Tasks >= 4.0.10-beta-*",
+      "System.Runtime.Handles >= 4.0.0-beta-*",
+      "System.Threading.ThreadPool >= 4.0.10-beta-*",
+      "System.Threading.Overlapped >= 4.0.0-beta-*",
+      "System.Dynamic.Runtime >= 4.0.10-beta-*",
+      "System.Threading.Tasks.Parallel >= 4.0.0-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "Microsoft.CodeAnalysis >= 1.0.0.0-beta2",
+      "Microsoft.CodeAnalysis.Common >= 1.0.0.0-beta2",
+      "Microsoft.CodeAnalysis.CSharp >= 1.0.0.0-beta2",
+      "Microsoft.CodeAnalysis.CSharp.Workspaces >= 1.0.0.0-beta2",
+      "Microsoft.CodeAnalysis.VisualBasic >= 1.0.0.0-beta2",
+      "Microsoft.CodeAnalysis.VisualBasic.Workspaces >= 1.0.0.0-beta2",
+      "Microsoft.CodeAnalysis.Workspaces.Common >= 1.0.0.0-beta2",
+      "System.Collections.Immutable >= 1.1.32-beta",
+      "System.Reflection.Metadata >= 1.0.17-beta"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/src/runtime/packages.config b/tests/src/runtime/packages.config
deleted file mode 100644 (file)
index 44de6b7..0000000
--- a/tests/src/runtime/packages.config
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.DotNet.CoreCLR.TestDependencies" version="1.0.0-prerelease" />
-  <package id="System.Collections" version="4.0.10-beta-22412" />
-  <package id="System.Collections.Concurrent" version="4.0.10-beta-22412" />
-  <package id="System.Console" version="4.0.0-beta-22412" />
-  <package id="System.Diagnostics.Contracts" version="4.0.0-beta-22412" />
-  <package id="System.Diagnostics.Debug" version="4.0.10-beta-22412" />
-  <package id="System.Diagnostics.Tools" version="4.0.0-beta-22412" />
-  <package id="System.Diagnostics.Tracing" version="4.0.10-beta-22412" />
-  <package id="System.Globalization" version="4.0.10-beta-22412" />
-  <package id="System.IO" version="4.0.10-beta-22412" />
-  <package id="System.IO.FileSystem" version="4.0.0-beta-22412" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.0-beta-22412" />
-  <package id="System.Linq" version="4.0.0-beta-22412" />
-  <package id="System.Reflection" version="4.0.10-beta-22412" />
-  <package id="System.Reflection.Extensions" version="4.0.0-beta-22412" />
-  <package id="System.Resources.ResourceManager" version="4.0.0-beta-22412" />
-  <package id="System.Runtime" version="4.0.20-beta-22412" />
-  <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" />
-  <package id="System.Runtime.Handles" version="4.0.0-beta-22412" />
-  <package id="System.Runtime.InteropServices" version="4.0.20-beta-22412" />
-  <package id="System.Text.Encoding" version="4.0.10-beta-22412" />
-  <package id="System.Text.Encoding.Extensions" version="4.0.10-beta-22412" />
-  <package id="System.Text.RegularExpressions" version="4.0.10-beta-22412" />
-  <package id="System.Threading" version="4.0.0-beta-22412" />
-  <package id="System.Threading.Tasks" version="4.0.10-beta-22412" />
-  <package id="System.Xml.ReaderWriter" version="4.0.10-beta-22412" />
-  <package id="System.Xml.XDocument" version="4.0.0-beta-22412" />
-  <package id="System.Threading.ThreadPool" version="4.0.10-beta-22512" />
-  <package id="System.Threading.Overlapped" version="4.0.0-beta-22512" />
-
-</packages>

diff --git a/tests/src/runtime/project.json b/tests/src/runtime/project.json
new file mode 100644 (file)
index 0000000..0a8ebfa
--- /dev/null
+++ b/tests/src/runtime/project.json
@@ -0,0 +1,38 @@
+{
+  "dependencies": {
+    "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease",
+    "System.Collections": "4.0.10-beta-*",
+    "System.Collections.Concurrent": "4.0.10-beta-*",
+    "System.Console": "4.0.0-beta-*",
+    "System.Diagnostics.Contracts": "4.0.0-beta-*",
+    "System.Diagnostics.Debug": "4.0.10-beta-*",
+    "System.Diagnostics.Tools": "4.0.0-beta-*",
+    "System.Diagnostics.Tracing": "4.0.10-beta-*",
+    "System.Dynamic.Runtime": "4.0.10-beta-*",
+    "System.Globalization": "4.0.10-beta-*",
+    "System.IO": "4.0.10-beta-*",
+    "System.IO.FileSystem": "4.0.0-beta-*",
+    "System.IO.FileSystem.Primitives": "4.0.0-beta-*",
+    "System.Linq": "4.0.0-beta-*",
+    "System.Reflection": "4.0.10-beta-*",
+    "System.Reflection.Extensions": "4.0.0-beta-*",
+    "System.Resources.ResourceManager": "4.0.0-beta-*",
+    "System.Runtime": "4.0.20-beta-*",
+    "System.Runtime.Extensions": "4.0.10-beta-*",
+    "System.Runtime.Handles": "4.0.0-beta-*",
+    "System.Runtime.InteropServices": "4.0.20-beta-*",
+    "System.Text.Encoding": "4.0.10-beta-*",
+    "System.Text.Encoding.Extensions": "4.0.10-beta-*",
+    "System.Text.RegularExpressions": "4.0.10-beta-*",
+    "System.Threading": "4.0.0-beta-*",
+    "System.Threading.Tasks": "4.0.10-beta-*",
+    "System.Xml.ReaderWriter": "4.0.10-beta-*",
+    "System.Xml.XDocument": "4.0.10-beta-*",
+    "System.Threading.ThreadPool": "4.0.10-beta-*",
+    "System.Threading.Overlapped": "4.0.0-beta-*"
+  },
+  "frameworks": {
+    "dnxcore50": {}
+  }
+}
+

diff --git a/tests/src/runtime/project.lock.json b/tests/src/runtime/project.lock.json
new file mode 100644 (file)
index 0000000..8da1eee
--- /dev/null
+++ b/tests/src/runtime/project.lock.json
@@ -0,0 +1,1832 @@
+{
+  "locked": true,
+  "version": -9996,
+  "targets": {
+    "DNXCore,Version=v5.0": {
+      "Microsoft.DotNet.CoreCLR.TestDependencies/1.0.0-prerelease": {
+        "compile": {
+          "lib/aspnetcore50/API-MS-Win-Base-Util-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-com-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-com-private-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-comm-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-console-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-console-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-datetime-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-datetime-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-debug-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-debug-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-delayload-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-errorhandling-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-errorhandling-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-fibers-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-fibers-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-file-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-file-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-file-l1-2-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-file-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-file-l2-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-handle-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-heap-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-heap-obsolete-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-interlocked-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-io-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-io-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-kernel32-legacy-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-kernel32-legacy-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-kernel32-legacy-l1-1-2.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-Kernel32-Private-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-Kernel32-Private-L1-1-1.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-Kernel32-Private-L1-1-2.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-libraryloader-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-libraryloader-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-localization-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-localization-l1-2-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-localization-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-localization-obsolete-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-memory-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-memory-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-memory-l1-1-2.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-memory-l1-1-3.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-namedpipe-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-normalization-l1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-PrivateProfile-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-privateprofile-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processenvironment-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processenvironment-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processsecurity-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processthreads-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processthreads-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processthreads-l1-1-2.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-ProcessTopology-Obsolete-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-profile-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-psapi-ansi-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-psapi-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-psapi-obsolete-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-realtime-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-registry-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-registry-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-rtlsupport-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-shlwapi-legacy-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-shlwapi-obsolete-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-shutdown-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-shutdown-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-string-l1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-String-L2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-string-obsolete-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-string-obsolete-l1-1-1.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-StringAnsi-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-stringloader-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-stringloader-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-synch-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-synch-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-2-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-2-2.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-threadpool-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-threadpool-legacy-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-threadpool-private-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-timezone-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-url-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-util-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-version-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-error-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-error-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-registration-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-robuffer-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-string-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-wow64-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-xstate-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-xstate-l2-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-devices-config-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-devices-config-L1-1-1.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Eventing-ClassicProvider-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Eventing-Consumer-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Eventing-Controller-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Eventing-Legacy-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Eventing-Provider-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-EventLog-Legacy-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-ro-typeresolution-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-base-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-cryptoapi-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-lsalookup-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-lsalookup-l2-1-1.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Security-LsaPolicy-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-provider-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-sddl-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-core-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-core-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-management-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-management-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-private-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-private-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-winsvc-l1-1-0.dll": {},
+          "lib/aspnetcore50/System.Core.dll": {},
+          "lib/aspnetcore50/System.dll": {},
+          "lib/aspnetcore50/System.Xml.dll": {},
+          "lib/aspnetcore50/System.Xml.Linq.dll": {}
+        },
+        "runtime": {
+          "lib/aspnetcore50/API-MS-Win-Base-Util-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-com-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-com-private-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-comm-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-console-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-console-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-datetime-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-datetime-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-debug-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-debug-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-delayload-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-errorhandling-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-errorhandling-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-fibers-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-fibers-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-file-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-file-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-file-l1-2-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-file-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-file-l2-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-handle-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-heap-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-heap-obsolete-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-interlocked-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-io-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-io-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-kernel32-legacy-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-kernel32-legacy-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-kernel32-legacy-l1-1-2.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-Kernel32-Private-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-Kernel32-Private-L1-1-1.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-Kernel32-Private-L1-1-2.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-libraryloader-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-libraryloader-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-localization-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-localization-l1-2-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-localization-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-localization-obsolete-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-memory-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-memory-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-memory-l1-1-2.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-memory-l1-1-3.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-namedpipe-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-normalization-l1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-PrivateProfile-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-privateprofile-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processenvironment-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processenvironment-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processsecurity-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processthreads-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processthreads-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-processthreads-l1-1-2.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-ProcessTopology-Obsolete-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-profile-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-psapi-ansi-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-psapi-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-psapi-obsolete-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-realtime-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-registry-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-registry-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-rtlsupport-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-shlwapi-legacy-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-shlwapi-obsolete-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-shutdown-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-shutdown-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-string-l1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-String-L2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-string-obsolete-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-string-obsolete-l1-1-1.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Core-StringAnsi-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-stringloader-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-stringloader-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-synch-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-synch-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-2-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-2-2.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-threadpool-l1-2-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-threadpool-legacy-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-threadpool-private-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-timezone-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-url-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-util-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-version-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-error-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-error-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-registration-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-robuffer-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-winrt-string-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-wow64-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-xstate-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-core-xstate-l2-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-devices-config-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-devices-config-L1-1-1.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Eventing-ClassicProvider-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Eventing-Consumer-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Eventing-Controller-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Eventing-Legacy-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Eventing-Provider-L1-1-0.dll": {},
+          "lib/aspnetcore50/API-MS-Win-EventLog-Legacy-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-ro-typeresolution-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-base-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-cryptoapi-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-lsalookup-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-lsalookup-l2-1-1.dll": {},
+          "lib/aspnetcore50/API-MS-Win-Security-LsaPolicy-L1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-provider-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-security-sddl-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-core-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-core-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-management-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-management-l2-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-private-l1-1-0.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-private-l1-1-1.dll": {},
+          "lib/aspnetcore50/api-ms-win-service-winsvc-l1-1-0.dll": {},
+          "lib/aspnetcore50/System.Core.dll": {},
+          "lib/aspnetcore50/System.dll": {},
+          "lib/aspnetcore50/System.Xml.dll": {},
+          "lib/aspnetcore50/System.Xml.Linq.dll": {}
+        }
+      },
+      "System.Collections/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Collections.dll": {}
+        }
+      },
+      "System.Collections.Concurrent/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Diagnostics.Tracing": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Collections.Concurrent.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Collections.Concurrent.dll": {}
+        }
+      },
+      "System.Console/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Console.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Console.dll": {}
+        }
+      },
+      "System.Diagnostics.Contracts/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Contracts.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Contracts.dll": {}
+        }
+      },
+      "System.Diagnostics.Debug/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Debug.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Debug.dll": {}
+        }
+      },
+      "System.Diagnostics.Tools/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Tools.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Diagnostics.Tools.dll": {}
+        }
+      },
+      "System.Diagnostics.Tracing/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Diagnostics.Tracing.dll": {}
+        }
+      },
+      "System.Dynamic.Runtime/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Collections": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Reflection.Emit": "4.0.0-beta-23024",
+          "System.ObjectModel": "4.0.0-beta-23024",
+          "System.Threading": "4.0.0-beta-23024",
+          "System.Reflection.TypeExtensions": "4.0.0-beta-23024",
+          "System.Runtime.Extensions": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024",
+          "System.Linq": "4.0.0-beta-23024",
+          "System.Linq.Expressions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Dynamic.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Dynamic.Runtime.dll": {}
+        }
+      },
+      "System.Globalization/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Globalization.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Globalization.dll": {}
+        }
+      },
+      "System.IO/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.dll": {}
+        }
+      },
+      "System.IO.FileSystem/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024",
+          "System.Threading.Overlapped": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.IO.FileSystem.dll": {}
+        }
+      },
+      "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.IO.FileSystem.Primitives.dll": {}
+        }
+      },
+      "System.Linq/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Linq.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Linq.dll": {}
+        }
+      },
+      "System.Linq.Expressions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Collections": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.TypeExtensions": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Reflection.Emit": "4.0.0-beta-23024",
+          "System.ObjectModel": "4.0.0-beta-23024",
+          "System.Threading": "4.0.0-beta-23024",
+          "System.Runtime.Extensions": "4.0.0-beta-23024",
+          "System.Linq": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024",
+          "System.Reflection.Extensions": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Linq.Expressions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Linq.Expressions.dll": {}
+        }
+      },
+      "System.ObjectModel/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.ObjectModel.dll": {}
+        }
+      },
+      "System.Private.Uri/4.0.0-beta-23024": {
+        "runtime": {
+          "lib/DNXCore50/System.Private.Uri.dll": {}
+        }
+      },
+      "System.Reflection/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.dll": {}
+        }
+      },
+      "System.Reflection.Emit/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Emit.ILGeneration": "4.0.0-beta-23024",
+          "System.IO": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Emit.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Emit.dll": {}
+        }
+      },
+      "System.Reflection.Emit.ILGeneration/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Emit.ILGeneration.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Emit.ILGeneration.dll": {}
+        }
+      },
+      "System.Reflection.Extensions/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Extensions.dll": {}
+        }
+      },
+      "System.Reflection.Primitives/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.Primitives.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.Primitives.dll": {}
+        }
+      },
+      "System.Reflection.TypeExtensions/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Reflection.TypeExtensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Reflection.TypeExtensions.dll": {}
+        }
+      },
+      "System.Resources.ResourceManager/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Globalization": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Resources.ResourceManager.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Resources.ResourceManager.dll": {}
+        }
+      },
+      "System.Runtime/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Private.Uri": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.dll": {}
+        }
+      },
+      "System.Runtime.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Extensions.dll": {}
+        }
+      },
+      "System.Runtime.Handles/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.Handles.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.Handles.dll": {}
+        }
+      },
+      "System.Runtime.InteropServices/4.0.20-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Reflection": "4.0.0-beta-23024",
+          "System.Reflection.Primitives": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Runtime.InteropServices.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Runtime.InteropServices.dll": {}
+        }
+      },
+      "System.Text.Encoding/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.dll": {}
+        }
+      },
+      "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.Encoding.Extensions.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
+        }
+      },
+      "System.Text.RegularExpressions/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Text.RegularExpressions.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Text.RegularExpressions.dll": {}
+        }
+      },
+      "System.Threading/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Threading.Tasks": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.dll": {}
+        }
+      },
+      "System.Threading.Overlapped/4.0.0-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.Handles": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Overlapped.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Overlapped.dll": {}
+        }
+      },
+      "System.Threading.Tasks/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.Tasks.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.Tasks.dll": {}
+        }
+      },
+      "System.Threading.ThreadPool/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.0-beta-23024",
+          "System.Runtime.InteropServices": "4.0.0-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Threading.ThreadPool.dll": {}
+        },
+        "runtime": {
+          "lib/DNXCore50/System.Threading.ThreadPool.dll": {}
+        }
+      },
+      "System.Xml.ReaderWriter/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Threading.Tasks": "4.0.10-beta-23024",
+          "System.Runtime.InteropServices": "4.0.20-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.IO.FileSystem": "4.0.0-beta-23024",
+          "System.IO.FileSystem.Primitives": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Text.RegularExpressions": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024",
+          "System.Text.Encoding.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Xml.ReaderWriter.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Xml.ReaderWriter.dll": {}
+        }
+      },
+      "System.Xml.XDocument/4.0.10-beta-23024": {
+        "dependencies": {
+          "System.Runtime": "4.0.20-beta-23024",
+          "System.IO": "4.0.10-beta-23024",
+          "System.Xml.ReaderWriter": "4.0.10-beta-23024",
+          "System.Resources.ResourceManager": "4.0.0-beta-23024",
+          "System.Diagnostics.Debug": "4.0.10-beta-23024",
+          "System.Collections": "4.0.10-beta-23024",
+          "System.Globalization": "4.0.10-beta-23024",
+          "System.Threading": "4.0.10-beta-23024",
+          "System.Text.Encoding": "4.0.10-beta-23024",
+          "System.Reflection": "4.0.10-beta-23024",
+          "System.Runtime.Extensions": "4.0.10-beta-23024"
+        },
+        "compile": {
+          "ref/dotnet/System.Xml.XDocument.dll": {}
+        },
+        "runtime": {
+          "lib/dotnet/System.Xml.XDocument.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "Microsoft.DotNet.CoreCLR.TestDependencies/1.0.0-prerelease": {
+      "sha512": "vz04+hDn8cLuWssbzTfJ8qhtfjkUSrGiW35crQYMy+a7pLfUbaFUiU3oDEe9maUV8/RNqsoels3MBK2vJB5Nhw==",
+      "files": [
+        "Microsoft.DotNet.CoreCLR.TestDependencies.1.0.0-prerelease.nupkg",
+        "Microsoft.DotNet.CoreCLR.TestDependencies.1.0.0-prerelease.nupkg.sha512",
+        "Microsoft.DotNet.CoreCLR.TestDependencies.nuspec",
+        "lib/aspnetcore50/API-MS-Win-Base-Util-L1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-com-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-com-private-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-comm-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-console-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-console-l2-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-datetime-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-datetime-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-debug-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-debug-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-delayload-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-errorhandling-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-errorhandling-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-fibers-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-fibers-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-file-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-file-l1-2-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-file-l1-2-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-file-l2-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-file-l2-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-handle-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-heap-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-heap-obsolete-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-interlocked-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-io-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-io-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-kernel32-legacy-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-kernel32-legacy-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-kernel32-legacy-l1-1-2.dll",
+        "lib/aspnetcore50/API-MS-Win-Core-Kernel32-Private-L1-1-0.dll",
+        "lib/aspnetcore50/API-MS-Win-Core-Kernel32-Private-L1-1-1.dll",
+        "lib/aspnetcore50/API-MS-Win-Core-Kernel32-Private-L1-1-2.dll",
+        "lib/aspnetcore50/api-ms-win-core-libraryloader-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-libraryloader-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-localization-l1-2-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-localization-l1-2-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-localization-l2-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-localization-obsolete-l1-2-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-memory-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-memory-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-memory-l1-1-2.dll",
+        "lib/aspnetcore50/api-ms-win-core-memory-l1-1-3.dll",
+        "lib/aspnetcore50/api-ms-win-core-namedpipe-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-normalization-l1-1-0.dll",
+        "lib/aspnetcore50/API-MS-Win-Core-PrivateProfile-L1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-privateprofile-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-processenvironment-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-processenvironment-l1-2-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-processsecurity-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-processthreads-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-processthreads-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-processthreads-l1-1-2.dll",
+        "lib/aspnetcore50/API-MS-Win-Core-ProcessTopology-Obsolete-L1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-profile-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-psapi-ansi-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-psapi-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-psapi-obsolete-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-realtime-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-registry-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-registry-l2-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-rtlsupport-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-shlwapi-legacy-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-shlwapi-obsolete-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-shutdown-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-shutdown-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-string-l1-1-0.dll",
+        "lib/aspnetcore50/API-MS-Win-Core-String-L2-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-string-obsolete-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-string-obsolete-l1-1-1.dll",
+        "lib/aspnetcore50/API-MS-Win-Core-StringAnsi-L1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-stringloader-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-stringloader-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-synch-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-synch-l1-2-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-2-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-2-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-sysinfo-l1-2-2.dll",
+        "lib/aspnetcore50/api-ms-win-core-threadpool-l1-2-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-threadpool-legacy-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-threadpool-private-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-timezone-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-url-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-util-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-version-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-winrt-error-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-winrt-error-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-core-winrt-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-winrt-registration-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-winrt-robuffer-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-winrt-string-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-wow64-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-xstate-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-core-xstate-l2-1-0.dll",
+        "lib/aspnetcore50/API-MS-Win-devices-config-L1-1-0.dll",
+        "lib/aspnetcore50/API-MS-Win-devices-config-L1-1-1.dll",
+        "lib/aspnetcore50/API-MS-Win-Eventing-ClassicProvider-L1-1-0.dll",
+        "lib/aspnetcore50/API-MS-Win-Eventing-Consumer-L1-1-0.dll",
+        "lib/aspnetcore50/API-MS-Win-Eventing-Controller-L1-1-0.dll",
+        "lib/aspnetcore50/API-MS-Win-Eventing-Legacy-L1-1-0.dll",
+        "lib/aspnetcore50/API-MS-Win-Eventing-Provider-L1-1-0.dll",
+        "lib/aspnetcore50/API-MS-Win-EventLog-Legacy-L1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-ro-typeresolution-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-security-base-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-security-cryptoapi-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-security-lsalookup-l2-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-security-lsalookup-l2-1-1.dll",
+        "lib/aspnetcore50/API-MS-Win-Security-LsaPolicy-L1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-security-provider-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-security-sddl-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-service-core-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-service-core-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-service-management-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-service-management-l2-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-service-private-l1-1-0.dll",
+        "lib/aspnetcore50/api-ms-win-service-private-l1-1-1.dll",
+        "lib/aspnetcore50/api-ms-win-service-winsvc-l1-1-0.dll",
+        "lib/aspnetcore50/System.Core.dll",
+        "lib/aspnetcore50/System.dll",
+        "lib/aspnetcore50/System.Xml.dll",
+        "lib/aspnetcore50/System.Xml.Linq.dll"
+      ]
+    },
+    "System.Collections/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "2ISUf3MQt7JbeT6kXg36qY3fnkjykPXccHcBP0qyTc5vEjbLihC7KCxkHPFJWteKR8lvvSF3+8ES5J34VqezmQ==",
+      "files": [
+        "System.Collections.4.0.10-beta-23024.nupkg",
+        "System.Collections.4.0.10-beta-23024.nupkg.sha512",
+        "System.Collections.nuspec",
+        "lib/DNXCore50/System.Collections.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Collections.dll",
+        "ref/dotnet/System.Collections.dll",
+        "ref/dotnet/System.Collections.xml",
+        "ref/dotnet/de/System.Collections.xml",
+        "ref/dotnet/es/System.Collections.xml",
+        "ref/dotnet/fr/System.Collections.xml",
+        "ref/dotnet/it/System.Collections.xml",
+        "ref/dotnet/ja/System.Collections.xml",
+        "ref/dotnet/ko/System.Collections.xml",
+        "ref/dotnet/ru/System.Collections.xml",
+        "ref/dotnet/zh-hans/System.Collections.xml",
+        "ref/dotnet/zh-hant/System.Collections.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Collections.dll"
+      ]
+    },
+    "System.Collections.Concurrent/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "yJtHT5QpsuoMDuOz552wi/2kodOdwvfyfBgAWSJP80/P+uIGdSer4k3x11lTv8RGgcwrnhFtClK4COvYDtDS0A==",
+      "files": [
+        "System.Collections.Concurrent.4.0.10-beta-23024.nupkg",
+        "System.Collections.Concurrent.4.0.10-beta-23024.nupkg.sha512",
+        "System.Collections.Concurrent.nuspec",
+        "lib/dotnet/System.Collections.Concurrent.dll",
+        "lib/net46/_._",
+        "ref/dotnet/System.Collections.Concurrent.dll",
+        "ref/dotnet/System.Collections.Concurrent.xml",
+        "ref/dotnet/de/System.Collections.Concurrent.xml",
+        "ref/dotnet/es/System.Collections.Concurrent.xml",
+        "ref/dotnet/fr/System.Collections.Concurrent.xml",
+        "ref/dotnet/it/System.Collections.Concurrent.xml",
+        "ref/dotnet/ja/System.Collections.Concurrent.xml",
+        "ref/dotnet/ko/System.Collections.Concurrent.xml",
+        "ref/dotnet/ru/System.Collections.Concurrent.xml",
+        "ref/dotnet/zh-hans/System.Collections.Concurrent.xml",
+        "ref/dotnet/zh-hant/System.Collections.Concurrent.xml",
+        "ref/net46/_._"
+      ]
+    },
+    "System.Console/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UZq1tgMJ/8TknBXBRVHDrLq4cK7f6m1pxyKbGwadmiapWowkNiB0J8wAFM30iWdiZDr8awzWLBigHxC4/8a8bQ==",
+      "files": [
+        "System.Console.4.0.0-beta-23024.nupkg",
+        "System.Console.4.0.0-beta-23024.nupkg.sha512",
+        "System.Console.nuspec",
+        "lib/DNXCore50/System.Console.dll",
+        "lib/net46/System.Console.dll",
+        "ref/dotnet/System.Console.dll",
+        "ref/dotnet/System.Console.xml",
+        "ref/dotnet/de/System.Console.xml",
+        "ref/dotnet/es/System.Console.xml",
+        "ref/dotnet/fr/System.Console.xml",
+        "ref/dotnet/it/System.Console.xml",
+        "ref/dotnet/ja/System.Console.xml",
+        "ref/dotnet/ko/System.Console.xml",
+        "ref/dotnet/ru/System.Console.xml",
+        "ref/dotnet/zh-hans/System.Console.xml",
+        "ref/dotnet/zh-hant/System.Console.xml",
+        "ref/net46/System.Console.dll"
+      ]
+    },
+    "System.Diagnostics.Contracts/4.0.0-beta-23024": {
+      "sha512": "vrK940Q2O/q6/mXKLcGvKzqG4zsyX47eaYxXSMRGC49SXWcZ4yHb8L29QPfAihXEXx2P4WAtHqvcWE9gtDCp2g==",
+      "files": [
+        "System.Diagnostics.Contracts.4.0.0-beta-23024.nupkg",
+        "System.Diagnostics.Contracts.4.0.0-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Contracts.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Contracts.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Diagnostics.Contracts.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Diagnostics.Contracts.dll",
+        "ref/dotnet/System.Diagnostics.Contracts.xml",
+        "ref/dotnet/de/System.Diagnostics.Contracts.xml",
+        "ref/dotnet/es/System.Diagnostics.Contracts.xml",
+        "ref/dotnet/fr/System.Diagnostics.Contracts.xml",
+        "ref/dotnet/it/System.Diagnostics.Contracts.xml",
+        "ref/dotnet/ja/System.Diagnostics.Contracts.xml",
+        "ref/dotnet/ko/System.Diagnostics.Contracts.xml",
+        "ref/dotnet/ru/System.Diagnostics.Contracts.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Contracts.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Contracts.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Diagnostics.Contracts.dll",
+        "ref/netcore50/System.Diagnostics.Contracts.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Contracts.dll"
+      ]
+    },
+    "System.Diagnostics.Debug/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "dnfynhlmsMaRB/YvN5JifCdYYnRf/mTjFAAM1awp3wrjsgOSpAzOE4sxYX0hdY1FyAFTDcUnusQ+H3AMcF3Stw==",
+      "files": [
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg",
+        "System.Diagnostics.Debug.4.0.10-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Debug.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Debug.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.dll",
+        "ref/dotnet/System.Diagnostics.Debug.xml",
+        "ref/dotnet/de/System.Diagnostics.Debug.xml",
+        "ref/dotnet/es/System.Diagnostics.Debug.xml",
+        "ref/dotnet/fr/System.Diagnostics.Debug.xml",
+        "ref/dotnet/it/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ja/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ko/System.Diagnostics.Debug.xml",
+        "ref/dotnet/ru/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Debug.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Debug.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Debug.dll"
+      ]
+    },
+    "System.Diagnostics.Tools/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "Je0gBNcoaMp7mnrTx73BfAhj+0cLtLAgscY7p7RVhBEOMfMIUqeBR3FP49tK2DwUQe1BvJBtGfdMhBtO0vw7cQ==",
+      "files": [
+        "System.Diagnostics.Tools.4.0.0-beta-23024.nupkg",
+        "System.Diagnostics.Tools.4.0.0-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Tools.nuspec",
+        "lib/DNXCore50/System.Diagnostics.Tools.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Diagnostics.Tools.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Diagnostics.Tools.dll",
+        "ref/dotnet/System.Diagnostics.Tools.xml",
+        "ref/dotnet/de/System.Diagnostics.Tools.xml",
+        "ref/dotnet/es/System.Diagnostics.Tools.xml",
+        "ref/dotnet/fr/System.Diagnostics.Tools.xml",
+        "ref/dotnet/it/System.Diagnostics.Tools.xml",
+        "ref/dotnet/ja/System.Diagnostics.Tools.xml",
+        "ref/dotnet/ko/System.Diagnostics.Tools.xml",
+        "ref/dotnet/ru/System.Diagnostics.Tools.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Tools.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Tools.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Diagnostics.Tools.dll",
+        "ref/netcore50/System.Diagnostics.Tools.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Diagnostics.Tools.dll"
+      ]
+    },
+    "System.Diagnostics.Tracing/4.0.10-beta-23024": {
+      "sha512": "5SS2p4NauCHOCmADiilADWE8Hk8DIEeKU9LKrUeaSpsgi9LZ70ebtlRzkNqtCa0xic//e6XyeQ8fXZThUFebog==",
+      "files": [
+        "License.rtf",
+        "System.Diagnostics.Tracing.4.0.10-beta-23024.nupkg",
+        "System.Diagnostics.Tracing.4.0.10-beta-23024.nupkg.sha512",
+        "System.Diagnostics.Tracing.nuspec",
+        "lib/net451/_._",
+        "lib/win81/_._",
+        "ref/dotnet/System.Diagnostics.Tracing.dll",
+        "ref/dotnet/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/de/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/es/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/fr/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/it/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/ja/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/ko/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/ru/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/zh-hans/System.Diagnostics.Tracing.xml",
+        "ref/dotnet/zh-hant/System.Diagnostics.Tracing.xml",
+        "ref/net451/_._",
+        "ref/netcore50/System.Diagnostics.Tracing.dll",
+        "ref/netcore50/System.Diagnostics.Tracing.xml",
+        "ref/netcore50/de/System.Diagnostics.Tracing.xml",
+        "ref/netcore50/es/System.Diagnostics.Tracing.xml",
+        "ref/netcore50/fr/System.Diagnostics.Tracing.xml",
+        "ref/netcore50/it/System.Diagnostics.Tracing.xml",
+        "ref/netcore50/ja/System.Diagnostics.Tracing.xml",
+        "ref/netcore50/ko/System.Diagnostics.Tracing.xml",
+        "ref/netcore50/ru/System.Diagnostics.Tracing.xml",
+        "ref/netcore50/zh-hans/System.Diagnostics.Tracing.xml",
+        "ref/netcore50/zh-hant/System.Diagnostics.Tracing.xml",
+        "ref/win81/_._"
+      ]
+    },
+    "System.Dynamic.Runtime/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "3CiMvB0locDLrxPaVJY4ZssiLUvTQaGU6WgQ7/TUfIJYZgeX1CMGEKj+RD7/kSiuv6IDhUiAIdoejNrATkgX2Q==",
+      "files": [
+        "runtime.json",
+        "System.Dynamic.Runtime.4.0.10-beta-23024.nupkg",
+        "System.Dynamic.Runtime.4.0.10-beta-23024.nupkg.sha512",
+        "System.Dynamic.Runtime.nuspec",
+        "lib/DNXCore50/System.Dynamic.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Dynamic.Runtime.dll",
+        "ref/dotnet/System.Dynamic.Runtime.dll",
+        "ref/dotnet/System.Dynamic.Runtime.xml",
+        "ref/dotnet/de/System.Dynamic.Runtime.xml",
+        "ref/dotnet/es/System.Dynamic.Runtime.xml",
+        "ref/dotnet/fr/System.Dynamic.Runtime.xml",
+        "ref/dotnet/it/System.Dynamic.Runtime.xml",
+        "ref/dotnet/ja/System.Dynamic.Runtime.xml",
+        "ref/dotnet/ko/System.Dynamic.Runtime.xml",
+        "ref/dotnet/ru/System.Dynamic.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Dynamic.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Dynamic.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Dynamic.Runtime.dll"
+      ]
+    },
+    "System.Globalization/4.0.10-beta-23024": {
+      "sha512": "RROZnwQ8phf5Sbb6h8rdnQCoppfKdWKmQ4CiWfvpbRG5XwWbVrMyZsBYazLTQ59MFXe8RXYHgHvE9OfnZPTCLQ==",
+      "files": [
+        "System.Globalization.4.0.10-beta-23024.nupkg",
+        "System.Globalization.4.0.10-beta-23024.nupkg.sha512",
+        "System.Globalization.nuspec",
+        "lib/DNXCore50/System.Globalization.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.dll",
+        "ref/dotnet/System.Globalization.xml",
+        "ref/dotnet/de/System.Globalization.xml",
+        "ref/dotnet/es/System.Globalization.xml",
+        "ref/dotnet/fr/System.Globalization.xml",
+        "ref/dotnet/it/System.Globalization.xml",
+        "ref/dotnet/ja/System.Globalization.xml",
+        "ref/dotnet/ko/System.Globalization.xml",
+        "ref/dotnet/ru/System.Globalization.xml",
+        "ref/dotnet/zh-hans/System.Globalization.xml",
+        "ref/dotnet/zh-hant/System.Globalization.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Globalization.dll"
+      ]
+    },
+    "System.IO/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "WSXeleSR+UFJqZQUhzkgcq/O4iyR+YTOIh0IXFXW6ABw+JfH56jb6AuQJwltzZXXtNbdz7Ha2A5OIeYIT6QRFw==",
+      "files": [
+        "System.IO.4.0.10-beta-23024.nupkg",
+        "System.IO.4.0.10-beta-23024.nupkg.sha512",
+        "System.IO.nuspec",
+        "lib/DNXCore50/System.IO.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.IO.dll",
+        "ref/dotnet/System.IO.dll",
+        "ref/dotnet/System.IO.xml",
+        "ref/dotnet/de/System.IO.xml",
+        "ref/dotnet/es/System.IO.xml",
+        "ref/dotnet/fr/System.IO.xml",
+        "ref/dotnet/it/System.IO.xml",
+        "ref/dotnet/ja/System.IO.xml",
+        "ref/dotnet/ko/System.IO.xml",
+        "ref/dotnet/ru/System.IO.xml",
+        "ref/dotnet/zh-hans/System.IO.xml",
+        "ref/dotnet/zh-hant/System.IO.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.IO.dll"
+      ]
+    },
+    "System.IO.FileSystem/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "CUlwZ5kM4QRQgsVj9/QQIr86hLr7U/E6evFXg6643qd63BppdfORu46tyQMxS/gsdrT4PiIRu7rrrguXiBR5ww==",
+      "files": [
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.nuspec",
+        "lib/DNXCore50/System.IO.FileSystem.dll",
+        "lib/net46/System.IO.FileSystem.dll",
+        "lib/netcore50/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.dll",
+        "ref/dotnet/System.IO.FileSystem.xml",
+        "ref/dotnet/de/System.IO.FileSystem.xml",
+        "ref/dotnet/es/System.IO.FileSystem.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.xml",
+        "ref/dotnet/it/System.IO.FileSystem.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.xml",
+        "ref/net46/System.IO.FileSystem.dll"
+      ]
+    },
+    "System.IO.FileSystem.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "86WpDEexzC+lt1oFesANFdk3BQ2tP74YgPS4uVnlhEqr/XZG/H7qbEWP72Dve/x+xbJ7/ifayfitIpc9byUu7Q==",
+      "files": [
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg",
+        "System.IO.FileSystem.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.IO.FileSystem.Primitives.nuspec",
+        "lib/dotnet/System.IO.FileSystem.Primitives.dll",
+        "lib/net46/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.dll",
+        "ref/dotnet/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/de/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/es/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/fr/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/it/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ja/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ko/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/ru/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hans/System.IO.FileSystem.Primitives.xml",
+        "ref/dotnet/zh-hant/System.IO.FileSystem.Primitives.xml",
+        "ref/net46/System.IO.FileSystem.Primitives.dll"
+      ]
+    },
+    "System.Linq/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "hVGW083n8Lf5J0uFrDqbbeZODqcpqlTls42aVbJXkELEBfRFOYdC3elpPEw/gtlLsBIUFfYJgq+a/7Mqv/i//g==",
+      "files": [
+        "System.Linq.4.0.0-beta-23024.nupkg",
+        "System.Linq.4.0.0-beta-23024.nupkg.sha512",
+        "System.Linq.nuspec",
+        "lib/dotnet/System.Linq.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Linq.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Linq.dll",
+        "ref/dotnet/System.Linq.xml",
+        "ref/dotnet/de/System.Linq.xml",
+        "ref/dotnet/es/System.Linq.xml",
+        "ref/dotnet/fr/System.Linq.xml",
+        "ref/dotnet/it/System.Linq.xml",
+        "ref/dotnet/ja/System.Linq.xml",
+        "ref/dotnet/ko/System.Linq.xml",
+        "ref/dotnet/ru/System.Linq.xml",
+        "ref/dotnet/zh-hans/System.Linq.xml",
+        "ref/dotnet/zh-hant/System.Linq.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Linq.dll",
+        "ref/netcore50/System.Linq.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Linq.Expressions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "M00ZX4duEc5ON96skfTKUXiGp4/qD3sz2SGhbOxBlHoDXJ5Ax0iUZGCDGHK9s7Ncf60qYPghtO2qy/7LVHHjHA==",
+      "files": [
+        "runtime.json",
+        "System.Linq.Expressions.4.0.10-beta-23024.nupkg",
+        "System.Linq.Expressions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Linq.Expressions.nuspec",
+        "lib/DNXCore50/System.Linq.Expressions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Linq.Expressions.dll",
+        "ref/dotnet/System.Linq.Expressions.dll",
+        "ref/dotnet/System.Linq.Expressions.xml",
+        "ref/dotnet/de/System.Linq.Expressions.xml",
+        "ref/dotnet/es/System.Linq.Expressions.xml",
+        "ref/dotnet/fr/System.Linq.Expressions.xml",
+        "ref/dotnet/it/System.Linq.Expressions.xml",
+        "ref/dotnet/ja/System.Linq.Expressions.xml",
+        "ref/dotnet/ko/System.Linq.Expressions.xml",
+        "ref/dotnet/ru/System.Linq.Expressions.xml",
+        "ref/dotnet/zh-hans/System.Linq.Expressions.xml",
+        "ref/dotnet/zh-hant/System.Linq.Expressions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Linq.Expressions.dll"
+      ]
+    },
+    "System.ObjectModel/4.0.0-beta-23024": {
+      "sha512": "2hZj5Njj6scQ2yCVTghA6qBO9XXPm25JbkefJZbokdJtkNWvCArSdK/r3bX6cXqLESkrH/wublHqTztNMnB8Dw==",
+      "files": [
+        "License.rtf",
+        "System.ObjectModel.4.0.0-beta-23024.nupkg",
+        "System.ObjectModel.4.0.0-beta-23024.nupkg.sha512",
+        "System.ObjectModel.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.ObjectModel.dll",
+        "ref/dotnet/System.ObjectModel.xml",
+        "ref/dotnet/de/System.ObjectModel.xml",
+        "ref/dotnet/es/System.ObjectModel.xml",
+        "ref/dotnet/fr/System.ObjectModel.xml",
+        "ref/dotnet/it/System.ObjectModel.xml",
+        "ref/dotnet/ja/System.ObjectModel.xml",
+        "ref/dotnet/ko/System.ObjectModel.xml",
+        "ref/dotnet/ru/System.ObjectModel.xml",
+        "ref/dotnet/zh-hans/System.ObjectModel.xml",
+        "ref/dotnet/zh-hant/System.ObjectModel.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.ObjectModel.dll",
+        "ref/netcore50/System.ObjectModel.xml",
+        "ref/netcore50/de/System.ObjectModel.xml",
+        "ref/netcore50/es/System.ObjectModel.xml",
+        "ref/netcore50/fr/System.ObjectModel.xml",
+        "ref/netcore50/it/System.ObjectModel.xml",
+        "ref/netcore50/ja/System.ObjectModel.xml",
+        "ref/netcore50/ko/System.ObjectModel.xml",
+        "ref/netcore50/ru/System.ObjectModel.xml",
+        "ref/netcore50/zh-hans/System.ObjectModel.xml",
+        "ref/netcore50/zh-hant/System.ObjectModel.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Private.Uri/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
+      "files": [
+        "System.Private.Uri.4.0.0-beta-23024.nupkg",
+        "System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
+        "System.Private.Uri.nuspec",
+        "lib/DNXCore50/System.Private.Uri.dll",
+        "lib/netcore50/System.Private.Uri.dll",
+        "ref/dnxcore50/_._",
+        "ref/netcore50/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
+      ]
+    },
+    "System.Reflection/4.0.10-beta-23024": {
+      "sha512": "Ky5yclJBgNu+NArFSblpe2FZ/IeLeOYLIP8hLBwTiVDRufjWDqPKcPtETfnmyZq61HGyhTJWFd1uEkhDOgxF9g==",
+      "files": [
+        "System.Reflection.4.0.10-beta-23024.nupkg",
+        "System.Reflection.4.0.10-beta-23024.nupkg.sha512",
+        "System.Reflection.nuspec",
+        "lib/DNXCore50/System.Reflection.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.dll",
+        "ref/dotnet/System.Reflection.xml",
+        "ref/dotnet/de/System.Reflection.xml",
+        "ref/dotnet/es/System.Reflection.xml",
+        "ref/dotnet/fr/System.Reflection.xml",
+        "ref/dotnet/it/System.Reflection.xml",
+        "ref/dotnet/ja/System.Reflection.xml",
+        "ref/dotnet/ko/System.Reflection.xml",
+        "ref/dotnet/ru/System.Reflection.xml",
+        "ref/dotnet/zh-hans/System.Reflection.xml",
+        "ref/dotnet/zh-hant/System.Reflection.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.dll"
+      ]
+    },
+    "System.Reflection.Emit/4.0.0-beta-23024": {
+      "sha512": "VNrqiyCvlNoPLQIak1J1+PL6f7tN7Esn6HTmoWvLwSjyztV+CikHfAYv+jQRYEOPILfEgsPFS73sj4H49b/1qw==",
+      "files": [
+        "System.Reflection.Emit.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Emit.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Emit.nuspec",
+        "lib/DNXCore50/System.Reflection.Emit.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Emit.dll",
+        "ref/dotnet/System.Reflection.Emit.dll",
+        "ref/dotnet/System.Reflection.Emit.xml",
+        "ref/dotnet/de/System.Reflection.Emit.xml",
+        "ref/dotnet/es/System.Reflection.Emit.xml",
+        "ref/dotnet/fr/System.Reflection.Emit.xml",
+        "ref/dotnet/it/System.Reflection.Emit.xml",
+        "ref/dotnet/ja/System.Reflection.Emit.xml",
+        "ref/dotnet/ko/System.Reflection.Emit.xml",
+        "ref/dotnet/ru/System.Reflection.Emit.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Emit.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Emit.xml",
+        "ref/net45/_._"
+      ]
+    },
+    "System.Reflection.Emit.ILGeneration/4.0.0-beta-23024": {
+      "sha512": "p6QfhflZWlM7VEQMMaBZSJ1ntASpnnD/usgOfUO9EtBcXfYsav0BoIB++p1ih41Zt2iPG5DUv9aYnP+njQb/SQ==",
+      "files": [
+        "System.Reflection.Emit.ILGeneration.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Emit.ILGeneration.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Emit.ILGeneration.nuspec",
+        "lib/DNXCore50/System.Reflection.Emit.ILGeneration.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Emit.ILGeneration.dll",
+        "ref/dotnet/System.Reflection.Emit.ILGeneration.dll",
+        "ref/dotnet/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/de/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/es/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/fr/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/it/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/ja/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/ko/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/ru/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Emit.ILGeneration.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Emit.ILGeneration.xml",
+        "ref/net45/_._"
+      ]
+    },
+    "System.Reflection.Extensions/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "Hb/Jq24QyHQ563tCB8C7qu5MlOsCc3NSopzvWAf2pU0CN0LnWH1M5W30TnVERBFWo46TJih5+IxGYhjtUU3b3A==",
+      "files": [
+        "System.Reflection.Extensions.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Extensions.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Extensions.nuspec",
+        "lib/DNXCore50/System.Reflection.Extensions.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Extensions.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Extensions.dll",
+        "ref/dotnet/System.Reflection.Extensions.xml",
+        "ref/dotnet/de/System.Reflection.Extensions.xml",
+        "ref/dotnet/es/System.Reflection.Extensions.xml",
+        "ref/dotnet/fr/System.Reflection.Extensions.xml",
+        "ref/dotnet/it/System.Reflection.Extensions.xml",
+        "ref/dotnet/ja/System.Reflection.Extensions.xml",
+        "ref/dotnet/ko/System.Reflection.Extensions.xml",
+        "ref/dotnet/ru/System.Reflection.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Extensions.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Extensions.dll",
+        "ref/netcore50/System.Reflection.Extensions.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Extensions.dll"
+      ]
+    },
+    "System.Reflection.Primitives/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
+      "files": [
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg",
+        "System.Reflection.Primitives.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.Primitives.nuspec",
+        "lib/DNXCore50/System.Reflection.Primitives.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Reflection.Primitives.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Reflection.Primitives.dll",
+        "ref/dotnet/System.Reflection.Primitives.xml",
+        "ref/dotnet/de/System.Reflection.Primitives.xml",
+        "ref/dotnet/es/System.Reflection.Primitives.xml",
+        "ref/dotnet/fr/System.Reflection.Primitives.xml",
+        "ref/dotnet/it/System.Reflection.Primitives.xml",
+        "ref/dotnet/ja/System.Reflection.Primitives.xml",
+        "ref/dotnet/ko/System.Reflection.Primitives.xml",
+        "ref/dotnet/ru/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hans/System.Reflection.Primitives.xml",
+        "ref/dotnet/zh-hant/System.Reflection.Primitives.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Reflection.Primitives.dll",
+        "ref/netcore50/System.Reflection.Primitives.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.Primitives.dll"
+      ]
+    },
+    "System.Reflection.TypeExtensions/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "UTsspl61Om2E/x08euAQIrf5d6ebbx4YB8iLvtUrgYBV/iia81X6yMiRobUfYSNKu7WVAxwVrzxyPM8gDaA0rA==",
+      "files": [
+        "System.Reflection.TypeExtensions.4.0.0-beta-23024.nupkg",
+        "System.Reflection.TypeExtensions.4.0.0-beta-23024.nupkg.sha512",
+        "System.Reflection.TypeExtensions.nuspec",
+        "lib/DNXCore50/System.Reflection.TypeExtensions.dll",
+        "lib/net46/System.Reflection.TypeExtensions.dll",
+        "lib/netcore50/System.Reflection.TypeExtensions.dll",
+        "ref/dotnet/System.Reflection.TypeExtensions.dll",
+        "ref/dotnet/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/de/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/es/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/fr/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/it/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/ja/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/ko/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/ru/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/zh-hans/System.Reflection.TypeExtensions.xml",
+        "ref/dotnet/zh-hant/System.Reflection.TypeExtensions.xml",
+        "ref/net46/System.Reflection.TypeExtensions.dll",
+        "runtimes/win8-aot/lib/netcore50/System.Reflection.TypeExtensions.dll"
+      ]
+    },
+    "System.Resources.ResourceManager/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "xIiopNepii+eLPHo3lak0jmJK2EhQa/Su33Kjpin3t2/ZrFB2m8NoJF/LMV7wpsz2k7rr74RsG1+/m8pZprx+w==",
+      "files": [
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg",
+        "System.Resources.ResourceManager.4.0.0-beta-23024.nupkg.sha512",
+        "System.Resources.ResourceManager.nuspec",
+        "lib/DNXCore50/System.Resources.ResourceManager.dll",
+        "lib/net45/_._",
+        "lib/netcore50/System.Resources.ResourceManager.dll",
+        "lib/win8/_._",
+        "ref/dotnet/System.Resources.ResourceManager.dll",
+        "ref/dotnet/System.Resources.ResourceManager.xml",
+        "ref/dotnet/de/System.Resources.ResourceManager.xml",
+        "ref/dotnet/es/System.Resources.ResourceManager.xml",
+        "ref/dotnet/fr/System.Resources.ResourceManager.xml",
+        "ref/dotnet/it/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ja/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ko/System.Resources.ResourceManager.xml",
+        "ref/dotnet/ru/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hans/System.Resources.ResourceManager.xml",
+        "ref/dotnet/zh-hant/System.Resources.ResourceManager.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Resources.ResourceManager.dll",
+        "ref/netcore50/System.Resources.ResourceManager.xml",
+        "ref/win8/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Resources.ResourceManager.dll"
+      ]
+    },
+    "System.Runtime/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
+      "files": [
+        "System.Runtime.4.0.20-beta-23024.nupkg",
+        "System.Runtime.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.nuspec",
+        "lib/DNXCore50/System.Runtime.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.dll",
+        "ref/dotnet/System.Runtime.xml",
+        "ref/dotnet/de/System.Runtime.xml",
+        "ref/dotnet/es/System.Runtime.xml",
+        "ref/dotnet/fr/System.Runtime.xml",
+        "ref/dotnet/it/System.Runtime.xml",
+        "ref/dotnet/ja/System.Runtime.xml",
+        "ref/dotnet/ko/System.Runtime.xml",
+        "ref/dotnet/ru/System.Runtime.xml",
+        "ref/dotnet/zh-hans/System.Runtime.xml",
+        "ref/dotnet/zh-hant/System.Runtime.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
+      ]
+    },
+    "System.Runtime.Extensions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
+      "files": [
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Runtime.Extensions.nuspec",
+        "lib/DNXCore50/System.Runtime.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.dll",
+        "ref/dotnet/System.Runtime.Extensions.xml",
+        "ref/dotnet/de/System.Runtime.Extensions.xml",
+        "ref/dotnet/es/System.Runtime.Extensions.xml",
+        "ref/dotnet/fr/System.Runtime.Extensions.xml",
+        "ref/dotnet/it/System.Runtime.Extensions.xml",
+        "ref/dotnet/ja/System.Runtime.Extensions.xml",
+        "ref/dotnet/ko/System.Runtime.Extensions.xml",
+        "ref/dotnet/ru/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
+      ]
+    },
+    "System.Runtime.Handles/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "O82TxLtp/afDkQixdjJutB7jdVlRx7vrQ+RPgL7iVLSREYE+HpuXpaKsW/3HqKm2G5D/FLmvYxZLiZitHfZ4Vw==",
+      "files": [
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg",
+        "System.Runtime.Handles.4.0.0-beta-23024.nupkg.sha512",
+        "System.Runtime.Handles.nuspec",
+        "lib/DNXCore50/System.Runtime.Handles.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.dll",
+        "ref/dotnet/System.Runtime.Handles.xml",
+        "ref/dotnet/de/System.Runtime.Handles.xml",
+        "ref/dotnet/es/System.Runtime.Handles.xml",
+        "ref/dotnet/fr/System.Runtime.Handles.xml",
+        "ref/dotnet/it/System.Runtime.Handles.xml",
+        "ref/dotnet/ja/System.Runtime.Handles.xml",
+        "ref/dotnet/ko/System.Runtime.Handles.xml",
+        "ref/dotnet/ru/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hans/System.Runtime.Handles.xml",
+        "ref/dotnet/zh-hant/System.Runtime.Handles.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.Handles.dll"
+      ]
+    },
+    "System.Runtime.InteropServices/4.0.20-beta-23024": {
+      "serviceable": true,
+      "sha512": "004lCjqaK1zgrQ8d+on557Qny5Szp/l0W6PqB10vgs9pe+0BqfHNPui1eDnzmfhIkp6OW5t35Oqu5Lo3fROqCA==",
+      "files": [
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg",
+        "System.Runtime.InteropServices.4.0.20-beta-23024.nupkg.sha512",
+        "System.Runtime.InteropServices.nuspec",
+        "lib/DNXCore50/System.Runtime.InteropServices.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.dll",
+        "ref/dotnet/System.Runtime.InteropServices.xml",
+        "ref/dotnet/de/System.Runtime.InteropServices.xml",
+        "ref/dotnet/es/System.Runtime.InteropServices.xml",
+        "ref/dotnet/fr/System.Runtime.InteropServices.xml",
+        "ref/dotnet/it/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ja/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ko/System.Runtime.InteropServices.xml",
+        "ref/dotnet/ru/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
+        "ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Runtime.InteropServices.dll"
+      ]
+    },
+    "System.Text.Encoding/4.0.10-beta-23024": {
+      "sha512": "rNCH8+rj+jrlVbw91Xrj6NpT2bhcQn0D66oCzSDPmXhf6+udI74M8SBGLI2qz48lc8L4Mr5dEIifEq2p4D1P3w==",
+      "files": [
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.dll",
+        "ref/dotnet/System.Text.Encoding.xml",
+        "ref/dotnet/de/System.Text.Encoding.xml",
+        "ref/dotnet/es/System.Text.Encoding.xml",
+        "ref/dotnet/fr/System.Text.Encoding.xml",
+        "ref/dotnet/it/System.Text.Encoding.xml",
+        "ref/dotnet/ja/System.Text.Encoding.xml",
+        "ref/dotnet/ko/System.Text.Encoding.xml",
+        "ref/dotnet/ru/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
+      ]
+    },
+    "System.Text.Encoding.Extensions/4.0.10-beta-23024": {
+      "sha512": "Y8JU73DQZKSSY7sz4I8PFOz5/Cp3Te02deN1Qfx8ndIOg9/uFi55p/SeeeaowvF+/iUqENRerSy5KX5YPZxcOQ==",
+      "files": [
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg",
+        "System.Text.Encoding.Extensions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.Encoding.Extensions.nuspec",
+        "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.dll",
+        "ref/dotnet/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/de/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/es/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/it/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
+        "ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
+      ]
+    },
+    "System.Text.RegularExpressions/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "dbbYvJczIWGYK4UChCYn6ZsBeRWXIA8UJAPaY8ovsNeP5pCGCLRVRPYnmk2oky5+18fwYy0gEArMF8szyRVHOg==",
+      "files": [
+        "System.Text.RegularExpressions.4.0.10-beta-23024.nupkg",
+        "System.Text.RegularExpressions.4.0.10-beta-23024.nupkg.sha512",
+        "System.Text.RegularExpressions.nuspec",
+        "lib/dotnet/System.Text.RegularExpressions.dll",
+        "lib/net46/_._",
+        "ref/dotnet/System.Text.RegularExpressions.dll",
+        "ref/dotnet/System.Text.RegularExpressions.xml",
+        "ref/dotnet/de/System.Text.RegularExpressions.xml",
+        "ref/dotnet/es/System.Text.RegularExpressions.xml",
+        "ref/dotnet/fr/System.Text.RegularExpressions.xml",
+        "ref/dotnet/it/System.Text.RegularExpressions.xml",
+        "ref/dotnet/ja/System.Text.RegularExpressions.xml",
+        "ref/dotnet/ko/System.Text.RegularExpressions.xml",
+        "ref/dotnet/ru/System.Text.RegularExpressions.xml",
+        "ref/dotnet/zh-hans/System.Text.RegularExpressions.xml",
+        "ref/dotnet/zh-hant/System.Text.RegularExpressions.xml",
+        "ref/net46/_._"
+      ]
+    },
+    "System.Threading/4.0.0-beta-23024": {
+      "sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
+      "files": [
+        "License.rtf",
+        "System.Threading.4.0.0-beta-23024.nupkg",
+        "System.Threading.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.nuspec",
+        "lib/net45/_._",
+        "lib/win8/_._",
+        "ref/dotnet/System.Threading.dll",
+        "ref/dotnet/System.Threading.xml",
+        "ref/dotnet/de/System.Threading.xml",
+        "ref/dotnet/es/System.Threading.xml",
+        "ref/dotnet/fr/System.Threading.xml",
+        "ref/dotnet/it/System.Threading.xml",
+        "ref/dotnet/ja/System.Threading.xml",
+        "ref/dotnet/ko/System.Threading.xml",
+        "ref/dotnet/ru/System.Threading.xml",
+        "ref/dotnet/zh-hans/System.Threading.xml",
+        "ref/dotnet/zh-hant/System.Threading.xml",
+        "ref/net45/_._",
+        "ref/netcore50/System.Threading.dll",
+        "ref/netcore50/System.Threading.xml",
+        "ref/netcore50/de/System.Threading.xml",
+        "ref/netcore50/es/System.Threading.xml",
+        "ref/netcore50/fr/System.Threading.xml",
+        "ref/netcore50/it/System.Threading.xml",
+        "ref/netcore50/ja/System.Threading.xml",
+        "ref/netcore50/ko/System.Threading.xml",
+        "ref/netcore50/ru/System.Threading.xml",
+        "ref/netcore50/zh-hans/System.Threading.xml",
+        "ref/netcore50/zh-hant/System.Threading.xml",
+        "ref/win8/_._"
+      ]
+    },
+    "System.Threading.Overlapped/4.0.0-beta-23024": {
+      "serviceable": true,
+      "sha512": "i5FkjE3Y++zufCyS68xiq8t/lwPyS2+urpv0MZUOID0pggCpqJiUGV5bnJRBo9Da79rpnVeFBleDOVFCnr2lrw==",
+      "files": [
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg",
+        "System.Threading.Overlapped.4.0.0-beta-23024.nupkg.sha512",
+        "System.Threading.Overlapped.nuspec",
+        "lib/DNXCore50/System.Threading.Overlapped.dll",
+        "lib/net46/System.Threading.Overlapped.dll",
+        "lib/netcore50/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.dll",
+        "ref/dotnet/System.Threading.Overlapped.xml",
+        "ref/dotnet/de/System.Threading.Overlapped.xml",
+        "ref/dotnet/es/System.Threading.Overlapped.xml",
+        "ref/dotnet/fr/System.Threading.Overlapped.xml",
+        "ref/dotnet/it/System.Threading.Overlapped.xml",
+        "ref/dotnet/ja/System.Threading.Overlapped.xml",
+        "ref/dotnet/ko/System.Threading.Overlapped.xml",
+        "ref/dotnet/ru/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hans/System.Threading.Overlapped.xml",
+        "ref/dotnet/zh-hant/System.Threading.Overlapped.xml",
+        "ref/net46/System.Threading.Overlapped.dll"
+      ]
+    },
+    "System.Threading.Tasks/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "QQaCcvp6FL14X2Hp3v+LoRoJKLWa0B6stwC5haZUfVICJnhgnOAPaeXcGc7R/x9TMN5+aGfxTgp+2cKgmOmrNQ==",
+      "files": [
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg",
+        "System.Threading.Tasks.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.Tasks.nuspec",
+        "lib/DNXCore50/System.Threading.Tasks.dll",
+        "lib/net46/_._",
+        "lib/netcore50/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.dll",
+        "ref/dotnet/System.Threading.Tasks.xml",
+        "ref/dotnet/de/System.Threading.Tasks.xml",
+        "ref/dotnet/es/System.Threading.Tasks.xml",
+        "ref/dotnet/fr/System.Threading.Tasks.xml",
+        "ref/dotnet/it/System.Threading.Tasks.xml",
+        "ref/dotnet/ja/System.Threading.Tasks.xml",
+        "ref/dotnet/ko/System.Threading.Tasks.xml",
+        "ref/dotnet/ru/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hans/System.Threading.Tasks.xml",
+        "ref/dotnet/zh-hant/System.Threading.Tasks.xml",
+        "ref/net46/_._",
+        "runtimes/win8-aot/lib/netcore50/System.Threading.Tasks.dll"
+      ]
+    },
+    "System.Threading.ThreadPool/4.0.10-beta-23024": {
+      "sha512": "ue4+ZEycLk4N5plLhBySK7oQLE+XotooYRbZnfwrXK6s61n9K1O8q1glGt7o8QJZbTfVYEjRG0Tk0jocYaTa2A==",
+      "files": [
+        "System.Threading.ThreadPool.4.0.10-beta-23024.nupkg",
+        "System.Threading.ThreadPool.4.0.10-beta-23024.nupkg.sha512",
+        "System.Threading.ThreadPool.nuspec",
+        "lib/DNXCore50/System.Threading.ThreadPool.dll",
+        "lib/net46/System.Threading.ThreadPool.dll",
+        "ref/dotnet/System.Threading.ThreadPool.dll",
+        "ref/dotnet/System.Threading.ThreadPool.xml",
+        "ref/dotnet/de/System.Threading.ThreadPool.xml",
+        "ref/dotnet/es/System.Threading.ThreadPool.xml",
+        "ref/dotnet/fr/System.Threading.ThreadPool.xml",
+        "ref/dotnet/it/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ja/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ko/System.Threading.ThreadPool.xml",
+        "ref/dotnet/ru/System.Threading.ThreadPool.xml",
+        "ref/dotnet/zh-hans/System.Threading.ThreadPool.xml",
+        "ref/dotnet/zh-hant/System.Threading.ThreadPool.xml",
+        "ref/net46/System.Threading.ThreadPool.dll"
+      ]
+    },
+    "System.Xml.ReaderWriter/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "X9UqQ448oTm1IRpsyW2VXdm7Sl3+4hiKLfTSXHGQIwhqmXDn6w9YJ5QrKvrRtnXZz0Wgebky8/Kz6a59+6nxfg==",
+      "files": [
+        "System.Xml.ReaderWriter.4.0.10-beta-23024.nupkg",
+        "System.Xml.ReaderWriter.4.0.10-beta-23024.nupkg.sha512",
+        "System.Xml.ReaderWriter.nuspec",
+        "lib/dotnet/System.Xml.ReaderWriter.dll",
+        "lib/net46/_._",
+        "ref/dotnet/System.Xml.ReaderWriter.dll",
+        "ref/dotnet/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/de/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/es/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/fr/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/it/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/ja/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/ko/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/ru/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/zh-hans/System.Xml.ReaderWriter.xml",
+        "ref/dotnet/zh-hant/System.Xml.ReaderWriter.xml",
+        "ref/net46/_._"
+      ]
+    },
+    "System.Xml.XDocument/4.0.10-beta-23024": {
+      "serviceable": true,
+      "sha512": "kEdUaXET7z5Cgq1DniSv7suMyZesqN5XGLztEw+SFP34nEBX5hwexYeLDRliXT5gPI33B+IwCYA1TcDYfV1BXg==",
+      "files": [
+        "System.Xml.XDocument.4.0.10-beta-23024.nupkg",
+        "System.Xml.XDocument.4.0.10-beta-23024.nupkg.sha512",
+        "System.Xml.XDocument.nuspec",
+        "lib/dotnet/System.Xml.XDocument.dll",
+        "lib/net46/_._",
+        "ref/dotnet/System.Xml.XDocument.dll",
+        "ref/dotnet/System.Xml.XDocument.xml",
+        "ref/dotnet/de/System.Xml.XDocument.xml",
+        "ref/dotnet/es/System.Xml.XDocument.xml",
+        "ref/dotnet/fr/System.Xml.XDocument.xml",
+        "ref/dotnet/it/System.Xml.XDocument.xml",
+        "ref/dotnet/ja/System.Xml.XDocument.xml",
+        "ref/dotnet/ko/System.Xml.XDocument.xml",
+        "ref/dotnet/ru/System.Xml.XDocument.xml",
+        "ref/dotnet/zh-hans/System.Xml.XDocument.xml",
+        "ref/dotnet/zh-hant/System.Xml.XDocument.xml",
+        "ref/net46/_._"
+      ]
+    }
+  },
+  "projectFileDependencyGroups": {
+    "": [
+      "Microsoft.DotNet.CoreCLR.TestDependencies >= 1.0.0-prerelease",
+      "System.Collections >= 4.0.10-beta-*",
+      "System.Collections.Concurrent >= 4.0.10-beta-*",
+      "System.Console >= 4.0.0-beta-*",
+      "System.Diagnostics.Contracts >= 4.0.0-beta-*",
+      "System.Diagnostics.Debug >= 4.0.10-beta-*",
+      "System.Diagnostics.Tools >= 4.0.0-beta-*",
+      "System.Diagnostics.Tracing >= 4.0.10-beta-*",
+      "System.Dynamic.Runtime >= 4.0.10-beta-*",
+      "System.Globalization >= 4.0.10-beta-*",
+      "System.IO >= 4.0.10-beta-*",
+      "System.IO.FileSystem >= 4.0.0-beta-*",
+      "System.IO.FileSystem.Primitives >= 4.0.0-beta-*",
+      "System.Linq >= 4.0.0-beta-*",
+      "System.Reflection >= 4.0.10-beta-*",
+      "System.Reflection.Extensions >= 4.0.0-beta-*",
+      "System.Resources.ResourceManager >= 4.0.0-beta-*",
+      "System.Runtime >= 4.0.20-beta-*",
+      "System.Runtime.Extensions >= 4.0.10-beta-*",
+      "System.Runtime.Handles >= 4.0.0-beta-*",
+      "System.Runtime.InteropServices >= 4.0.20-beta-*",
+      "System.Text.Encoding >= 4.0.10-beta-*",
+      "System.Text.Encoding.Extensions >= 4.0.10-beta-*",
+      "System.Text.RegularExpressions >= 4.0.10-beta-*",
+      "System.Threading >= 4.0.0-beta-*",
+      "System.Threading.Tasks >= 4.0.10-beta-*",
+      "System.Xml.ReaderWriter >= 4.0.10-beta-*",
+      "System.Xml.XDocument >= 4.0.10-beta-*",
+      "System.Threading.ThreadPool >= 4.0.10-beta-*",
+      "System.Threading.Overlapped >= 4.0.0-beta-*"
+    ],
+    "DNXCore,Version=v5.0": []
+  }
+}
\ No newline at end of file

diff --git a/tests/tests.targets b/tests/tests.targets
index 2bb2f16..87b7f00 100644 (file)
--- a/tests/tests.targets
+++ b/tests/tests.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <UsingTask AssemblyFile="$(PackagesDir)xunit.runners.2.0.0-beta5-build2785\tools\xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
+  <UsingTask AssemblyFile="$(PackagesDir)xunit.runners\2.0.0-beta5-build2785\tools\xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
   
   <ItemGroup>
     <_SkipTestAssemblies Include="$(SkipTestAssemblies)" />
@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <UsingTask
-    AssemblyFile="$(SourceDir)\packages\xunit.abstractions.$(XunitVersionCompiled)\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.runner.msbuild.dll"
+    AssemblyFile="$(SourceDir)\packages\xunit.abstractions\$(XunitVersionCompiled)\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.runner.msbuild.dll"
     TaskName="Xunit.Runner.MSBuild.xunit" />
 
    <Target Name="RunTests"

diff --git a/tests/xunitwrapper.targets b/tests/xunitwrapper.targets
new file mode 100644 (file)
index 0000000..2794d46
--- /dev/null
+++ b/tests/xunitwrapper.targets
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This overrides the typical ResolveNuGetPackages so that it does copy local of the
+     referenced items.  This is used so that we can correctly resolve and copy the libraries necessary
+     to the core_root directory -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="ResolveNuGetPackages" Condition="'$(ResolveNuGetPackages)'=='true'">
+    
+    <ResolveNuGetPackageAssets Condition="Exists($(ProjectLockJson))"
+                               Architecture="$(PlatformTarget)"
+                               Configuration="$(Configuration)"
+                               Language="$(Language)"
+                               PackageRoot="$(PackagesDir)"
+                               ProjectLockFile="$(ProjectLockJson)"
+                               TargetFrameworkMonikers="$(NugetTargetFrameworkMoniker)"
+                               TargetPlatformMonikers="$(TargetPlatformMoniker)">
+      <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" />
+      <Output TaskParameter="ResolvedReferences" ItemName="Reference" />
+      <Output TaskParameter="ResolvedCopyLocalItems" ItemName="CopyLocal" />
+    </ResolveNuGetPackageAssets>
+
+    <!-- We may have an indirect package reference that we want to replace with a project reference -->
+    <ItemGroup>
+      <!-- Convert to file names so that we can intersect -->
+      <_ProjectReferenceFilenames Include="@(_ResolvedProjectReferencePaths->'%(FileName)%(Extension)')">
+        <OriginalIdentity>%(Identity)</OriginalIdentity>
+      </_ProjectReferenceFilenames>
+
+      <_ReferencesFileNames Include="@(Reference->'%(FileName)%(Extension)')">
+        <OriginalIdentity>%(Identity)</OriginalIdentity>
+      </_ReferencesFileNames>
+
+      <_CopyLocalFileNames Include="@(CopyLocal->'%(FileName)%(Extension)')">
+        <OriginalIdentity>%(Identity)</OriginalIdentity>
+      </_CopyLocalFileNames>
+      
+      <!-- Intersect project-refs with package-refs -->
+      <_ReferenceFileNamesToRemove Include="@(_ReferencesFileNames->'%(OriginalIdentity)')" Condition="'@(_ProjectReferenceFilenames)' == '@(_ReferencesFileNames)' and '%(Identity)' != ''"/>
+      <_CopyLocalFileNamesToRemove Include="@(_CopyLocalFileNames->'%(OriginalIdentity)')" Condition="'@(_ProjectReferenceFilenames)' == '@(_CopyLocalFileNames)' and '%(Identity)' != ''"/>
+
+      <Reference Remove="@(_ReferenceFileNamesToRemove)" />
+      <CopyLocal Remove="@(_CopyLocalFileNamesToRemove)"/>
+    </ItemGroup>
+    
+    <Message Text="Excluding @(_ReferenceFileNamesToRemove);@(_CopyLocalFileNamesToRemove) from package references since the same file is provided by a project reference."
+             Condition="'@(_ReferenceFileNamesToRemove)' != '' or '@(_CopyLocalFileNamesToRemove)' != ''"/>
+             
+    <Copy
+      SourceFiles="@(CopyLocal)"
+      DestinationFolder="$(OutDir)"
+      SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
+      OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+      Retries="$(CopyRetryCount)"
+      RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+      UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)">
+      
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
+    
+  </Target>
+</Project>