Merge pull request #5483 from dotnet/master

[Automated] Merge 'master' into 'future'
dotnet · Sep 28, 2015 · f2ed4a3 · f2ed4a3
2 parents 299362a + a7382f4
commit f2ed4a3
Show file tree

Hide file tree

Showing 190 changed files with 14,859 additions and 3,461 deletions.
diff --git a/CrossPlatform.sln b/CrossPlatform.sln
@@ -95,21 +95,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugging", "Debugging", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DiaSymReader.PortablePdb", "src\Debugging\Microsoft.DiaSymReader.PortablePdb\Microsoft.DiaSymReader.PortablePdb.csproj", "{F83343BA-B4EA-451C-B6DB-5D645E6171BC}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestUtilities.Shared", "src\Test\Utilities\Portable\TestUtilities.Shared.shproj", "{6FF42825-5464-4151-AC55-ED828168C192}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CscCore", "src\Compilers\CSharp\CscCore\CscCore.csproj", "{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VbcCore", "src\Compilers\VisualBasic\VbcCore\VbcCore.csproj", "{8CE3A581-2969-4864-A803-013E9D977C3A}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestUtilities.Shared", "src\Test\Utilities\Shared\TestUtilities.Shared.shproj", "{6FF42825-5464-4151-AC55-ED828168C192}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\Test\Utilities\Portable\TestUtilities.projitems*{6ff42825-5464-4151-ac55-ed828168c192}*SharedItemsImports = 13
+		src\Test\Utilities\Shared\TestUtilities.projitems*{6ff42825-5464-4151-ac55-ed828168c192}*SharedItemsImports = 13
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 4
 		src\Test\Utilities\Shared\TestUtilities.projitems*{f7712928-1175-47b3-8819-ee086753dee2}*SharedItemsImports = 4
 		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4
-		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
+		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
 		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 4
 		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
@@ -879,5 +879,6 @@ Global
 		{F83343BA-B4EA-451C-B6DB-5D645E6171BC} = {5EFE4D73-9608-4E19-83A5-963B02413164}
 		{E3CD2895-76A8-4D11-A316-EA67CB5EA42C} = {32A48625-F0AD-419D-828B-A50BDABA38EA}
 		{8CE3A581-2969-4864-A803-013E9D977C3A} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
+		{6FF42825-5464-4151-AC55-ED828168C192} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
 	EndGlobalSection
 EndGlobal
diff --git a/build/Targets/VSL.Imports.targets b/build/Targets/VSL.Imports.targets
@@ -69,8 +69,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'DNXCore'">
-      <BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Windows_NT'">win</BaseNuGetRuntimeIdentifier>
-      <BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Unix'">linux</BaseNuGetRuntimeIdentifier>
+      <BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Windows_NT'">win7</BaseNuGetRuntimeIdentifier>
+      <BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Unix'">ubuntu.14.04</BaseNuGetRuntimeIdentifier>
   </PropertyGroup>
 
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.VisualBasic.targets"

diff --git a/build/Targets/VSL.Settings.targets b/build/Targets/VSL.Settings.targets
@@ -15,7 +15,7 @@
   <PropertyGroup>
     <ToolsetCompilerPackageName>Microsoft.Net.Compilers</ToolsetCompilerPackageName>
     <ToolsetCompilerPropsFilePath>$(NuGetPackageRoot)\Microsoft.Net.Compilers\1.1.0-beta1-20150727-01\build\Microsoft.Net.Compilers.props</ToolsetCompilerPropsFilePath>
-    <RoslynDiagnosticsPropsFilePath>$(NuGetPackageRoot)\Microsoft.Net.RoslynDiagnostics\1.1.1-beta1-20150814-01\build\Microsoft.Net.RoslynDiagnostics.props</RoslynDiagnosticsPropsFilePath>
+    <RoslynDiagnosticsPropsFilePath>$(NuGetPackageRoot)\Microsoft.Net.RoslynDiagnostics\1.1.1-beta1-20150818-01\build\Microsoft.Net.RoslynDiagnostics.props</RoslynDiagnosticsPropsFilePath>
     <AdditionalFileItemNames>$(AdditionalFileItemNames);PublicAPI</AdditionalFileItemNames>
   </PropertyGroup>
 

diff --git a/build/ToolsetPackages/project.json b/build/ToolsetPackages/project.json
@@ -4,7 +4,7 @@
         "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150817-01",
         "Microsoft.DiaSymReader.Native": "1.1.0-alpha2",
         "Microsoft.Net.Compilers": "1.1.0-beta1-20150727-01",
-        "Microsoft.Net.RoslynDiagnostics": "1.1.1-beta1-20150814-01",
+        "Microsoft.Net.RoslynDiagnostics": "1.1.1-beta1-20150818-01",
         "FakeSign": "0.9.2",
         "xunit": "1.9.2",
         "xunit.runner.console": "2.1.0-beta4-build3109",

diff --git a/build/ToolsetPackages/project.lock.json b/build/ToolsetPackages/project.lock.json
@@ -31,7 +31,7 @@
       },
       "Microsoft.DiaSymReader.Native/1.1.0-alpha2": {},
       "Microsoft.Net.Compilers/1.1.0-beta1-20150727-01": {},
-      "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150814-01": {},
+      "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": {},
       "Microsoft.Tpl.Dataflow/4.5.24": {
         "compile": {
           "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {}
@@ -85,7 +85,7 @@
         }
       },
       "Microsoft.Net.Compilers/1.1.0-beta1-20150727-01": {},
-      "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150814-01": {},
+      "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": {},
       "Microsoft.Tpl.Dataflow/4.5.24": {
         "compile": {
           "lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {}
@@ -1036,15 +1036,15 @@
         "tools/VBCSCompiler.exe.config"
       ]
     },
-    "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150814-01": {
-      "sha512": "ZsPiNo4TIlamP3VDJ7f+PzfLM2MwlQPW29Lm4gNn7j3EZvS2wu5RapJe6Edpz2OuFyZSq0U9NvNHmgM9I7W9Og==",
+    "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": {
+      "sha512": "gKMS7pSOjXejP+S3+pAIShKYOyfneRRZGowDiEGZDHPUZqaof7ccmFkXxWMyTy2hV00exSBqNeRZDL4IpJxuCQ==",
       "type": "Package",
       "files": [
         "[Content_Types].xml",
         "_rels/.rels",
         "build/Microsoft.Net.RoslynDiagnostics.props",
         "Microsoft.Net.RoslynDiagnostics.nuspec",
-        "package/services/metadata/core-properties/e01abf88844b465fabea2ac7ad8c8ffb.psmdcp",
+        "package/services/metadata/core-properties/433dcdf8a06f4dcb806e4f7f93ed8bf2.psmdcp",
         "ThirdPartyNotices.rtf",
         "tools/Roslyn.Diagnostics.Analyzers.CSharp.dll",
         "tools/Roslyn.Diagnostics.Analyzers.dll",
@@ -1130,7 +1130,7 @@
       "Microsoft.CodeAnalysis.Test.Resources.Proprietary >= 1.1.0-beta1-20150817-01",
       "Microsoft.DiaSymReader.Native >= 1.1.0-alpha2",
       "Microsoft.Net.Compilers >= 1.1.0-beta1-20150727-01",
-      "Microsoft.Net.RoslynDiagnostics >= 1.1.1-beta1-20150814-01",
+      "Microsoft.Net.RoslynDiagnostics >= 1.1.1-beta1-20150818-01",
       "xunit >= 1.9.2",
       "xunit.runner.console >= 2.1.0-beta4-build3109",
       "xunit.runners >= 2.0.0-alpha-build2576"

diff --git a/cibuild.sh b/cibuild.sh
@@ -77,9 +77,17 @@ release_sem()
 
 restore_nuget()
 {
+    # restore coreclr runtime package
+    pushd /tmp
+    local coreclr_package_name="coreclr.linux.1.zip"
+    rm $coreclr_package_name 2>/dev/null
+    curl -O https://dotnetci.blob.core.windows.net/roslyn/$coreclr_package_name
+    unzip -uoq $coreclr_package_name -d ~/
+    popd
+
     acquire_sem_or_wait "restore_nuget"
 
-    local package_name="nuget.11.zip"
+    local package_name="nuget.15.zip"
     local target="/tmp/$package_name"
     echo "Installing NuGet Packages $target"
     if [ -f $target ]; then
@@ -112,7 +120,7 @@ run_msbuild()
 
     for i in `seq 1 $RETRY_COUNT`
     do
-        mono $MONO_ARGS ~/.nuget/packages/Microsoft.Build.Mono.Debug/14.1.0-prerelease/lib/MSBuild.exe /v:m /p:SignAssembly=false /p:DebugSymbols=false "$@"
+        mono $MONO_ARGS ~/.nuget/packages/Microsoft.Build.Mono.Debug/14.1.0-prerelease/lib/MSBuild.exe /v:m /p:SignAssembly=false /p:UseRoslynAnalyzers=false /p:DebugSymbols=false "$@"
         if [ $? -eq 0 ]; then
             is_good=true
             break

diff --git a/docs/infrastructure/mono-toolset.md b/docs/infrastructure/mono-toolset.md
@@ -34,9 +34,11 @@ The cross platform restore works by downloading the contents of the packages dir
 This is done by executing the following on a Windows box.  
 
     - Change to the root of the enlistment.
-    - Delete the contents of the package directory. 
-    - Run .nuget/NuGetRestore.ps1 
-    - Zip the packages directory (via explorer) and name it nuget.X.zip (where X is one higher than the previous number)
+    - delete the contents of the `~\.nuget\packages`
+    - Run
+        - `.\nuget.exe restore Roslyn.sln`
+        - `.\nuget.exe restore build\ToolsetPackages\project.json`
+    - Zip the `~\.nuget` directory (via explorer) and name it nuget.X.zip (where X is one higher than the previous number)
     - Use [azcopy](https://azure.microsoft.com/en-us/documentation/articles/storage-use-azcopy) to upload to https://dotnetci.blob.core.windows.net/roslyn
     - Change cibuild.sh to reference the new package. 
 
diff --git a/src/Compilers/CSharp/CscCore/CscCore.csproj b/src/Compilers/CSharp/CscCore/CscCore.csproj
@@ -67,8 +67,11 @@
     <Compile Include="..\..\Helpers\ConsoleUtil.cs">
       <Link>ConsoleUtil.cs</Link>
     </Compile>
-    <Compile Include="..\..\Helpers\NoOpAnalyzerAssemblyLoader.cs">
-      <Link>ConsoleUtil.cs</Link>
+    <Compile Include="..\..\Helpers\CoreClrAnalyzerAssemblyLoader.cs">
+      <Link>CoreClrAnalyzerAssemblyLoader.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Helpers\AnalyzerAssemblyLoadUtils.cs">
+      <Link>AnalyzerAssemblyLoadUtils.cs</Link>
     </Compile>
     <Compile Include="Csc.cs" />
     <Compile Include="Program.cs" />
@@ -77,6 +80,9 @@
     <InternalsVisibleToTest Include="Roslyn.Compilers.CSharp.CommandLine.UnitTests" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="csc.cmd">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="csc.exe.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -88,4 +94,4 @@
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
   </ImportGroup>
-</Project>
+</Project>
diff --git a/src/Compilers/CSharp/CscCore/Program.cs b/src/Compilers/CSharp/CscCore/Program.cs
@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
+using Microsoft.CodeAnalysis;
 
 namespace Microsoft.CodeAnalysis.CSharp.CommandLine
 {
@@ -12,6 +13,6 @@ public static int Main(string[] args)
             => Csc.Run(args: args,
                        clientDirectory: AppContext.BaseDirectory,
                        sdkDirectory: null,
-                       analyzerLoader: new NoOpAnalyzerAssemblyLoader());
+                       analyzerLoader: CoreClrAnalyzerAssemblyLoader.CreateAndSetDefault());
     }
 }
diff --git a/src/Compilers/CSharp/CscCore/csc.cmd b/src/Compilers/CSharp/CscCore/csc.cmd
@@ -0,0 +1,2 @@
+echo off
+%~dp0\corerun.exe %~dp0\csc.exe %*
diff --git a/src/Compilers/CSharp/CscCore/project.json b/src/Compilers/CSharp/CscCore/project.json
@@ -1,43 +1,47 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.0",
-    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.1-beta-23310",
-    "System.AppContext": "4.0.1-beta-23310",
-    "System.Collections": "4.0.11-beta-23310",
-    "System.Console": "4.0.0-beta-23302",
-    "System.Diagnostics.Debug": "4.0.11-beta-23310",
-    "System.Diagnostics.Process": "4.1.0-beta-23310",
-    "System.Diagnostics.Tools": "4.0.1-beta-23310",
-    "System.Globalization": "4.0.11-beta-23310",
-    "System.IO": "4.0.11-beta-23310",
-    "System.IO.FileSystem": "4.0.1-beta-23302",
-    "System.IO.FileSystem.Primitives": "4.0.1-beta-23310",
-    "System.IO.Pipes": "4.0.0-beta-23310",
-    "System.Linq": "4.0.1-beta-23310",
-    "System.Private.Uri": "4.0.1-beta-23310",
-    "System.Reflection": "4.1.0-beta-23310",
-    "System.Reflection.Primitives": "4.0.1-beta-23310",
-    "System.Resources.ResourceManager": "4.0.1-beta-23310",
-    "System.Runtime": "4.0.21-beta-23310",
-    "System.Runtime.Extensions": "4.0.11-beta-23310",
-    "System.Runtime.Handles": "4.0.1-beta-23310",
-    "System.Runtime.InteropServices": "4.0.21-beta-23310",
-    "System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-23310",
-    "System.Text.Encoding": "4.0.11-beta-23310",
-    "System.Text.Encoding.Extensions": "4.0.11-beta-23310",
-    "System.Threading": "4.0.11-beta-23310",
-    "System.Threading.Tasks": "4.0.11-beta-23310",
-    "System.Threading.Thread": "4.0.0-beta-23310",
-    "System.Xml.XDocument": "4.0.11-beta-23310",
-    "System.Xml.XmlDocument": "4.0.1-beta-23310",
+    "Microsoft.NETCore.Platforms": "1.0.1-beta-23321",
+    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.1-beta-23321",
+    "Microsoft.NETCore.TestHost-x64": "1.0.0-beta-23213",
+    "System.AppContext": "4.0.1-beta-23321",
+    "System.Collections": "4.0.11-beta-23321",
+    "System.Collections.Immutable": "1.1.36",
+    "System.Console": "4.0.0-beta-23321",
+    "System.Diagnostics.Debug": "4.0.11-beta-23321",
+    "System.Diagnostics.FileVersionInfo": "4.0.0-beta-23321",
+    "System.Diagnostics.Process": "4.1.0-beta-23321",
+    "System.Diagnostics.Tools": "4.0.1-beta-23321",
+    "System.Dynamic.Runtime": "4.0.11-beta-23321",
+    "System.IO.FileSystem": "4.0.1-beta-23321",
+    "System.IO.Pipes": "4.0.0-beta-23321",
+    "System.Linq": "4.0.1-beta-23321",
+    "System.Private.Uri": "4.0.1-beta-23321",
+    "System.Reflection": "4.1.0-beta-23321",
+    "System.Reflection.Primitives": "4.0.1-beta-23321",
+    "System.Resources.ResourceManager": "4.0.1-beta-23321",
+    "System.Runtime": "4.0.21-beta-23321",
+    "System.Runtime.Extensions": "4.0.11-beta-23321",
+    "System.Runtime.Handles": "4.0.1-beta-23321",
+    "System.Runtime.InteropServices": "4.0.21-beta-23321",
+    "System.Runtime.Loader": "4.0.0-beta-23321",
+    "System.Runtime.Serialization.Json": "4.0.1-beta-23321",
+    "System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-23311",
+    "System.Text.Encoding": "4.0.11-beta-23321",
+    "System.Text.Encoding.CodePages": "4.0.1-beta-23321",
+    "System.Text.Encoding.Extensions": "4.0.11-beta-23321",
+    "System.Threading": "4.0.11-beta-23321",
+    "System.Threading.Tasks": "4.0.11-beta-23321",
+    "System.Threading.Thread": "4.0.0-beta-23321",
+    "System.Xml.XDocument": "4.0.11-beta-23321",
+    "System.Xml.XmlDocument": "4.0.1-beta-23321",
   },
   "frameworks": {
     "dnxcore50": {
       "imports": "portable-net452"
     }
   },
   "runtimes": {
-    "win-x64": { },
-    "linux-x64": { },
+    "win7-x64": { },
+    "ubuntu.14.04-x64": { },
   }
 }