From f02c57d390f94344429410c8a08ea189004e83e7 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Thu, 30 Jun 2016 15:57:11 -0700 Subject: [PATCH] Cleanup --- Restore.cmd | 13 ++++--- Roslyn.sln | 27 +++++++++++--- .../Telemetry/VisualStudioTelemetry.csproj | 36 +++++++------------ src/VisualStudio/Telemetry/project.json | 3 ++ 4 files changed, 46 insertions(+), 33 deletions(-) diff --git a/Restore.cmd b/Restore.cmd index b0af0e9c77541..f2b8e3e40df06 100644 --- a/Restore.cmd +++ b/Restore.cmd @@ -7,6 +7,7 @@ set NuGetAdditionalCommandLineArgs=-verbosity quiet -configfile "%RoslynRoot%nug :ParseArguments if /I "%1" == "/?" goto :Usage if /I "%1" == "/clean" set RestoreClean=true&&shift&& goto :ParseArguments +if /I "%1" == "/fast" set RestoreFast=true&&shift&& goto :ParseArguments goto :DoneParsing :DoneParsing @@ -23,11 +24,13 @@ if "%RestoreClean%" == "true" ( call %NugetExe% locals all -clear || goto :CleanFailed ) -echo Deleting project.lock.json files -pushd "%RoslynRoot%src" -echo "Dummy lock file to avoid error when there is no project.lock.json file" > project.lock.json -del /s /q project.lock.json -popd +if "%RestoreFast%" == "" ( + echo Deleting project.lock.json files + pushd "%RoslynRoot%src" + echo "Dummy lock file to avoid error when there is no project.lock.json file" > project.lock.json + del /s /q project.lock.json + popd +) echo Restoring packages: Toolsets call %NugetExe% restore "%RoslynRoot%build\ToolsetPackages\project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed diff --git a/Roslyn.sln b/Roslyn.sln index b08e95dfeb25c..1b8aac12e000a 100644 --- a/Roslyn.sln +++ b/Roslyn.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysisTest", "src\Compilers\Core\CodeAnalysisTest\CodeAnalysisTest.csproj", "{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}" EndProject @@ -376,6 +376,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perf.Utilities", "src\Test\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perf.Runner", "src\Test\Perf\Runner\Perf.Runner.csproj", "{1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudioTelemetry", "src\VisualStudio\Telemetry\VisualStudioTelemetry.csproj", "{63FB8976-170E-4FB0-ABB8-6A7070C55DC7}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4 @@ -398,28 +400,28 @@ Global src\Compilers\Core\CommandLine\CommandLine.projitems*{ad6f474e-e6d4-4217-91f3-b7af1be31ccc}*SharedItemsImports = 13 src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{e8f0baa5-7327-43d1-9a51-644e81ae55f1}*SharedItemsImports = 13 src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13 - src\Compilers\Core\CommandLine\CommandLine.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4 src\Compilers\Server\ServerShared\ServerShared.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4 + src\Compilers\Core\CommandLine\CommandLine.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{e58ee9d7-1239-4961-a0c1-f9ec3952c4c1}*SharedItemsImports = 4 src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}*SharedItemsImports = 4 - src\Compilers\Core\CommandLine\CommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 4 src\Compilers\Server\ServerShared\ServerShared.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 4 + src\Compilers\Core\CommandLine\CommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 4 src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d4}*SharedItemsImports = 4 src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d3}*SharedItemsImports = 4 src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4 src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{fa0e905d-ec46-466d-b7b2-3b5557f9428c}*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\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4 src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4 + src\Compilers\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4 src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 4 src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{bedc5a4a-809e-4017-9cfd-6c8d4e1847f0}*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\CommandLine\CommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 4 src\Compilers\Core\SharedCollections\SharedCollections.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13 - src\Compilers\Core\CommandLine\CommandLine.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4 src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4 + src\Compilers\Core\CommandLine\CommandLine.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{e3cd2895-76a8-4d11-a316-ea67cb5ea42c}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -3223,6 +3225,20 @@ Global {1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|x64.Build.0 = Release|Any CPU {1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|x86.ActiveCfg = Release|Any CPU {1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720}.Release|x86.Build.0 = Release|Any CPU + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Debug|Any CPU.ActiveCfg = Debug|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Debug|ARM.ActiveCfg = Debug|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Debug|x64.ActiveCfg = Debug|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Debug|x86.ActiveCfg = Debug|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Debug|x86.Build.0 = Debug|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Release|Any CPU.ActiveCfg = Release|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Release|ARM.ActiveCfg = Release|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Release|Mixed Platforms.Build.0 = Release|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Release|x64.ActiveCfg = Release|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Release|x86.ActiveCfg = Release|x86 + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3394,5 +3410,6 @@ Global {DD13507E-D5AF-4B61-B11A-D55D6F4A73A5} = {CAD2965A-19AB-489F-BE2E-7649957F914A} {59AD474E-2A35-4E8A-A74D-E33479977FBF} = {DD13507E-D5AF-4B61-B11A-D55D6F4A73A5} {1AA6D2F0-2C40-4AF6-BB79-50AFDCC62720} = {DD13507E-D5AF-4B61-B11A-D55D6F4A73A5} + {63FB8976-170E-4FB0-ABB8-6A7070C55DC7} = {8DBA5174-B0AA-4561-82B1-A46607697753} EndGlobalSection EndGlobal diff --git a/src/VisualStudio/Telemetry/VisualStudioTelemetry.csproj b/src/VisualStudio/Telemetry/VisualStudioTelemetry.csproj index 8a3f025acf56d..0f62121768afc 100644 --- a/src/VisualStudio/Telemetry/VisualStudioTelemetry.csproj +++ b/src/VisualStudio/Telemetry/VisualStudioTelemetry.csproj @@ -1,7 +1,7 @@  - + Debug @@ -26,7 +26,7 @@ v4.6 - + {1ee8cad3-55f9-4d91-96b2-084641da9a6c} CodeAnalysis @@ -35,7 +35,7 @@ False - + {b501a547-c911-4a05-ac6e-274a50dff30e} CSharpCodeAnalysis @@ -44,7 +44,7 @@ False - + {3cdeeab7-2256-418a-beb2-620b5cb16302} EditorFeatures @@ -53,7 +53,7 @@ False - + {2e87fa96-50bb-4607-8676-46521599f998} Workspaces.Desktop @@ -62,7 +62,7 @@ False - + {5f8d2414-064a-4b3a-9b42-8e2a04246be5} Workspaces @@ -71,7 +71,7 @@ False - + {edc68a0e-c68d-4a74-91b7-bf38ec909888} Features @@ -80,7 +80,7 @@ False - + {86FD5B9A-4FA0-4B10-B59F-CFAF077A859C} ServicesVisualStudio @@ -89,7 +89,7 @@ False - + {5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9} CSharpVisualStudio @@ -98,7 +98,7 @@ False - + {D49439D7-56D2-450F-A4F0-74CB95D620E6} BasicVisualStudio @@ -107,7 +107,7 @@ False - + {201EC5B7-F91E-45E5-B9F2-67A266CCE6FC} VisualStudioSetup False @@ -125,7 +125,7 @@ - + ProvideRoslynBindingRedirection.cs @@ -141,23 +141,13 @@ - - false - $(DevenvDir)PublicAssemblies\Microsoft.VisualStudio.ComponentModelHost.dll - - - False - - - True - - + diff --git a/src/VisualStudio/Telemetry/project.json b/src/VisualStudio/Telemetry/project.json index 8ead8bc463c83..37f01b310deab 100644 --- a/src/VisualStudio/Telemetry/project.json +++ b/src/VisualStudio/Telemetry/project.json @@ -1,5 +1,8 @@ { "dependencies": { + "RoslynDependencies.Microsoft.VisualStudio.ComponentModelHost": "14.0.23107", + "RoslynDependencies.Microsoft.Internal.Performance.CodeMarkers.DesignTime": "14.0.23107", + "RoslynDependencies.Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime": "14.0.23107" }, "frameworks": { "net46": {}