Updating Test.exe to run MSTest dlls (changeset 1315417)

e290beb6 · jmarolf · 1ac6df49 · e290beb6 · e290beb6 · e290beb6
6 changed file
--- a/Src/Samples/.nuget/NuGet.Config
+++ b/Src/Samples/.nuget/NuGet.Config
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>
\ No newline at end of file
--- a/Src/Samples/.nuget/NuGet.exe
+++ b/Src/Samples/.nuget/NuGet.exe
--- a/Src/Samples/.nuget/NuGet.targets
+++ b/Src/Samples/.nuget/NuGet.targets
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+        <!-- Determines if package restore consent is required to restore packages -->
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+
+        <!-- Download NuGet.exe if it does not already exist -->
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(PackageSources)' == '' ">
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+        <!-- Windows specific commands -->
+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
+        <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
+      <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup>
+        <!-- NuGet command -->
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+        <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+    </Target>
+
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">        
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)"
+              Condition=" '$(OS)' != 'Windows_NT' " />
+
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+        <ParameterGroup>
+            <OutputFilename ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Reference Include="System.Core" />
+            <Using Namespace="System" />
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.Net" />
+            <Using Namespace="Microsoft.Build.Framework" />
+            <Using Namespace="Microsoft.Build.Utilities" />
+            <Code Type="Fragment" Language="cs">
+                <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+</Project>
--- a/Src/Samples/CSharp/APISampleUnitTests/FAQ.cs
+++ b/Src/Samples/CSharp/APISampleUnitTests/FAQ.cs
@@ -2241,7 +2241,7 @@ public override SyntaxNode VisitExpressionStatement(ExpressionStatementSyntax no
        public string Execute(Compilation comp)
        {
            var output = new StringBuilder();
-            string exeFilename = "Output.exe", outputName = null, pdbFilename = "Output.pdb", xmlCommentsFilename = "Output.xml";
+            string exeFilename = "OutputCS.exe", outputName = null, pdbFilename = "OutputCS.pdb", xmlCommentsFilename = "OutputCS.xml";
            EmitResult emitResult = null;

            using (var ilStream = new FileStream(exeFilename, FileMode.OpenOrCreate))

--- a/Src/Samples/Samples.sln
+++ b/Src/Samples/Samples.sln
@@ -49,6 +49,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncPackage", "CSharp\Asyn
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncPackage.Test", "CSharp\AsyncPackage\Test\AsyncPackage.Test.csproj", "{0D9287FD-F17F-4CB8-B622-904E69994AC6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B00C02A7-7E65-46D8-B56F-2314D189E607}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.targets = .nuget\NuGet.targets
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -165,79 +172,79 @@ Global
 		SccNumberOfProjects = 21
 		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
 		SccTeamFoundationServer = http://vstfdevdiv:8080/devdiv2
-		SccProjectUniqueName0 = CSharp\\APISampleUnitTests\\APISampleUnitTestsCS.csproj
-		SccProjectTopLevelParentUniqueName0 = Samples.sln
-		SccProjectName0 = CSharp/APISampleUnitTests
-		SccLocalPath0 = CSharp\\APISampleUnitTests
-		SccProjectUniqueName1 = CSharp\\ConsoleClassifier\\ConsoleClassifierCS.csproj
+		SccLocalPath0 = .
+		SccProjectUniqueName1 = CSharp\\APISampleUnitTests\\APISampleUnitTestsCS.csproj
 		SccProjectTopLevelParentUniqueName1 = Samples.sln
-		SccProjectName1 = CSharp/ConsoleClassifier
-		SccLocalPath1 = CSharp\\ConsoleClassifier
-		SccProjectUniqueName2 = CSharp\\ConvertToAutoProperty\\Impl\\ConvertToAutoPropertyCS.csproj
+		SccProjectName1 = CSharp/APISampleUnitTests
+		SccLocalPath1 = CSharp\\APISampleUnitTests
+		SccProjectUniqueName2 = CSharp\\ConsoleClassifier\\ConsoleClassifierCS.csproj
 		SccProjectTopLevelParentUniqueName2 = Samples.sln
-		SccProjectName2 = CSharp/ConvertToAutoProperty/Impl
-		SccLocalPath2 = CSharp\\ConvertToAutoProperty\\Impl
-		SccProjectUniqueName3 = CSharp\\FormatSolution\\FormatSolutionCS.csproj
+		SccProjectName2 = CSharp/ConsoleClassifier
+		SccLocalPath2 = CSharp\\ConsoleClassifier
+		SccProjectUniqueName3 = CSharp\\ConvertToAutoProperty\\Impl\\ConvertToAutoPropertyCS.csproj
 		SccProjectTopLevelParentUniqueName3 = Samples.sln
-		SccProjectName3 = CSharp/FormatSolution
-		SccLocalPath3 = CSharp\\FormatSolution
-		SccProjectUniqueName4 = CSharp\\ImplementNotifyPropertyChanged\\Impl\\ImplementNotifyPropertyChangedCS.csproj
+		SccProjectName3 = CSharp/ConvertToAutoProperty/Impl
+		SccLocalPath3 = CSharp\\ConvertToAutoProperty\\Impl
+		SccProjectUniqueName4 = CSharp\\FormatSolution\\FormatSolutionCS.csproj
 		SccProjectTopLevelParentUniqueName4 = Samples.sln
-		SccProjectName4 = CSharp/ImplementNotifyPropertyChanged/Impl
-		SccLocalPath4 = CSharp\\ImplementNotifyPropertyChanged\\Impl
-		SccProjectUniqueName5 = CSharp\\ImplementNotifyPropertyChanged\\Test\\ImplementNotifyPropertyChangedCS.UnitTests.csproj
+		SccProjectName4 = CSharp/FormatSolution
+		SccLocalPath4 = CSharp\\FormatSolution
+		SccProjectUniqueName5 = CSharp\\ImplementNotifyPropertyChanged\\Impl\\ImplementNotifyPropertyChangedCS.csproj
 		SccProjectTopLevelParentUniqueName5 = Samples.sln
-		SccProjectName5 = CSharp/ImplementNotifyPropertyChanged/Test
-		SccLocalPath5 = CSharp\\ImplementNotifyPropertyChanged\\Test
-		SccProjectUniqueName6 = CSharp\\MakeConst\\Impl\\MakeConstCS.csproj
+		SccProjectName5 = CSharp/ImplementNotifyPropertyChanged/Impl
+		SccLocalPath5 = CSharp\\ImplementNotifyPropertyChanged\\Impl
+		SccProjectUniqueName6 = CSharp\\ImplementNotifyPropertyChanged\\Test\\ImplementNotifyPropertyChangedCS.UnitTests.csproj
 		SccProjectTopLevelParentUniqueName6 = Samples.sln
-		SccProjectName6 = CSharp/MakeConst/Impl
-		SccLocalPath6 = CSharp\\MakeConst\\Impl
-		SccProjectUniqueName7 = CSharp\\MakeConst\\Test\\MakeConstCS.UnitTests.csproj
+		SccProjectName6 = CSharp/ImplementNotifyPropertyChanged/Test
+		SccLocalPath6 = CSharp\\ImplementNotifyPropertyChanged\\Test
+		SccProjectUniqueName7 = CSharp\\MakeConst\\Impl\\MakeConstCS.csproj
 		SccProjectTopLevelParentUniqueName7 = Samples.sln
-		SccProjectName7 = CSharp/MakeConst/Test
-		SccLocalPath7 = CSharp\\MakeConst\\Test
-		SccProjectUniqueName8 = Shared\\UnitTestFramework\\UnitTestFramework.csproj
+		SccProjectName7 = CSharp/MakeConst/Impl
+		SccLocalPath7 = CSharp\\MakeConst\\Impl
+		SccProjectUniqueName8 = CSharp\\MakeConst\\Test\\MakeConstCS.UnitTests.csproj
 		SccProjectTopLevelParentUniqueName8 = Samples.sln
-		SccProjectName8 = Shared/UnitTestFramework
-		SccLocalPath8 = Shared\\UnitTestFramework
-		SccProjectUniqueName9 = VisualBasic\\APISampleUnitTests\\APISampleUnitTestsVB.vbproj
+		SccProjectName8 = CSharp/MakeConst/Test
+		SccLocalPath8 = CSharp\\MakeConst\\Test
+		SccProjectUniqueName9 = Shared\\UnitTestFramework\\UnitTestFramework.csproj
 		SccProjectTopLevelParentUniqueName9 = Samples.sln
-		SccProjectName9 = VisualBasic/APISampleUnitTests
-		SccLocalPath9 = VisualBasic\\APISampleUnitTests
-		SccProjectUniqueName10 = VisualBasic\\ConsoleClassifier\\ConsoleClassifierVB.vbproj
+		SccProjectName9 = Shared/UnitTestFramework
+		SccLocalPath9 = Shared\\UnitTestFramework
+		SccProjectUniqueName10 = VisualBasic\\APISampleUnitTests\\APISampleUnitTestsVB.vbproj
 		SccProjectTopLevelParentUniqueName10 = Samples.sln
-		SccProjectName10 = VisualBasic/ConsoleClassifier
-		SccLocalPath10 = VisualBasic\\ConsoleClassifier
-		SccProjectUniqueName11 = VisualBasic\\ConvertToAutoProperty\\Impl\\ConvertToAutoPropertyVB.vbproj
+		SccProjectName10 = VisualBasic/APISampleUnitTests
+		SccLocalPath10 = VisualBasic\\APISampleUnitTests
+		SccProjectUniqueName11 = VisualBasic\\ConsoleClassifier\\ConsoleClassifierVB.vbproj
 		SccProjectTopLevelParentUniqueName11 = Samples.sln
-		SccProjectName11 = VisualBasic/ConvertToAutoProperty/Impl
-		SccLocalPath11 = VisualBasic\\ConvertToAutoProperty\\Impl
-		SccProjectUniqueName12 = VisualBasic\\ConvertToAutoProperty\\Test\\ConvertToAutoPropertyVB.UnitTests.vbproj
+		SccProjectName11 = VisualBasic/ConsoleClassifier
+		SccLocalPath11 = VisualBasic\\ConsoleClassifier
+		SccProjectUniqueName12 = VisualBasic\\ConvertToAutoProperty\\Impl\\ConvertToAutoPropertyVB.vbproj
 		SccProjectTopLevelParentUniqueName12 = Samples.sln
-		SccProjectName12 = VisualBasic/ConvertToAutoProperty/Test
-		SccLocalPath12 = VisualBasic\\ConvertToAutoProperty\\Test
-		SccProjectUniqueName13 = VisualBasic\\FormatSolution\\FormatSolutionVB.vbproj
+		SccProjectName12 = VisualBasic/ConvertToAutoProperty/Impl
+		SccLocalPath12 = VisualBasic\\ConvertToAutoProperty\\Impl
+		SccProjectUniqueName13 = VisualBasic\\ConvertToAutoProperty\\Test\\ConvertToAutoPropertyVB.UnitTests.vbproj
 		SccProjectTopLevelParentUniqueName13 = Samples.sln
-		SccProjectName13 = VisualBasic/FormatSolution
-		SccLocalPath13 = VisualBasic\\FormatSolution
-		SccProjectUniqueName14 = VisualBasic\\ImplementNotifyPropertyChanged\\Impl\\ImplementNotifyPropertyChangedVB.vbproj
+		SccProjectName13 = VisualBasic/ConvertToAutoProperty/Test
+		SccLocalPath13 = VisualBasic\\ConvertToAutoProperty\\Test
+		SccProjectUniqueName14 = VisualBasic\\FormatSolution\\FormatSolutionVB.vbproj
 		SccProjectTopLevelParentUniqueName14 = Samples.sln
-		SccProjectName14 = VisualBasic/ImplementNotifyPropertyChanged/Impl
-		SccLocalPath14 = VisualBasic\\ImplementNotifyPropertyChanged\\Impl
-		SccProjectUniqueName15 = VisualBasic\\ImplementNotifyPropertyChanged\\Test\\ImplementNotifyPropertyChangedVB.UnitTests.vbproj
+		SccProjectName14 = VisualBasic/FormatSolution
+		SccLocalPath14 = VisualBasic\\FormatSolution
+		SccProjectUniqueName15 = VisualBasic\\ImplementNotifyPropertyChanged\\Impl\\ImplementNotifyPropertyChangedVB.vbproj
 		SccProjectTopLevelParentUniqueName15 = Samples.sln
-		SccProjectName15 = VisualBasic/ImplementNotifyPropertyChanged/Test
-		SccLocalPath15 = VisualBasic\\ImplementNotifyPropertyChanged\\Test
-		SccProjectUniqueName16 = VisualBasic\\MakeConst\\Impl\\MakeConstVB.vbproj
+		SccProjectName15 = VisualBasic/ImplementNotifyPropertyChanged/Impl
+		SccLocalPath15 = VisualBasic\\ImplementNotifyPropertyChanged\\Impl
+		SccProjectUniqueName16 = VisualBasic\\ImplementNotifyPropertyChanged\\Test\\ImplementNotifyPropertyChangedVB.UnitTests.vbproj
 		SccProjectTopLevelParentUniqueName16 = Samples.sln
-		SccProjectName16 = VisualBasic/MakeConst/Impl
-		SccLocalPath16 = VisualBasic\\MakeConst\\Impl
-		SccProjectUniqueName17 = VisualBasic\\MakeConst\\Test\\MakeConstVB.UnitTests.vbproj
+		SccProjectName16 = VisualBasic/ImplementNotifyPropertyChanged/Test
+		SccLocalPath16 = VisualBasic\\ImplementNotifyPropertyChanged\\Test
+		SccProjectUniqueName17 = VisualBasic\\MakeConst\\Impl\\MakeConstVB.vbproj
 		SccProjectTopLevelParentUniqueName17 = Samples.sln
-		SccProjectName17 = VisualBasic/MakeConst/Test
-		SccLocalPath17 = VisualBasic\\MakeConst\\Test
-		SccLocalPath18 = .
+		SccProjectName17 = VisualBasic/MakeConst/Impl
+		SccLocalPath17 = VisualBasic\\MakeConst\\Impl
+		SccProjectUniqueName18 = VisualBasic\\MakeConst\\Test\\MakeConstVB.UnitTests.vbproj
+		SccProjectTopLevelParentUniqueName18 = Samples.sln
+		SccProjectName18 = VisualBasic/MakeConst/Test
+		SccLocalPath18 = VisualBasic\\MakeConst\\Test
 		SccProjectUniqueName19 = CSharp\\AsyncPackage\\AsyncPackage.csproj
 		SccProjectTopLevelParentUniqueName19 = Samples.sln
 		SccProjectName19 = CSharp/AsyncPackage

--- a/Src/Samples/VisualBasic/APISampleUnitTests/FAQ.vb
+++ b/Src/Samples/VisualBasic/APISampleUnitTests/FAQ.vb
@@ -2313,7 +2313,7 @@ End Module
        ' A simple helper to execute the code present inside a compilation.
        Public Function Execute(comp As Compilation) As String
            Dim output = New StringBuilder()
-            Dim exeFilename As String = "Output.exe", pdbFilename As String = "Output.pdb", xmlCommentsFilename As String = "Output.xml"
+            Dim exeFilename As String = "OutputVB.exe", pdbFilename As String = "OutputVB.pdb", xmlCommentsFilename As String = "OutputVB.xml"
            Dim emitResult As Microsoft.CodeAnalysis.Emit.EmitResult = Nothing

            Using ilStream = New FileStream(exeFilename, FileMode.OpenOrCreate),