diff --git a/build/Targets/Roslyn.Toolsets.Xunit.targets b/build/Targets/Roslyn.Toolsets.Xunit.targets index d0a1164938f00..5140fec1443f3 100644 --- a/build/Targets/Roslyn.Toolsets.Xunit.targets +++ b/build/Targets/Roslyn.Toolsets.Xunit.targets @@ -16,7 +16,7 @@ true true - win + $(RoslynDesktopRuntimeIdentifier) diff --git a/build/Targets/Settings.props b/build/Targets/Settings.props index d5249b9e49e75..7d059a01762a2 100644 --- a/build/Targets/Settings.props +++ b/build/Targets/Settings.props @@ -35,7 +35,8 @@ net461;netcoreapp2.0 net46;netcoreapp2.0 win;win-x64;linux-x64;osx-x64 - win + win + win-x86 true true diff --git a/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj b/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj index 4e2cc4e4956ee..81c66fe5000c4 100644 --- a/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj +++ b/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj @@ -10,7 +10,7 @@ Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests Roslyn.Compilers.CSharp.CommandLine.UnitTests net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj b/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj index 81b5cb9421f5f..286ed9983e07c 100644 --- a/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj +++ b/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj @@ -10,7 +10,7 @@ Microsoft.CodeAnalysis.CSharp.UnitTests Roslyn.Compilers.CSharp.Emit.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest true diff --git a/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj b/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj index 59c59401200c5..7b8ed3f0bb29c 100644 --- a/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj +++ b/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj @@ -10,7 +10,7 @@ Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen Roslyn.Compilers.CSharp.WinRT.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj b/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj index 600f172ab2af1..4ec183df4d3f0 100644 --- a/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj +++ b/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj @@ -11,7 +11,7 @@ Roslyn.Compilers.UnitTests true net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj b/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj index 6aac37620b2e8..3cb816fd524cd 100644 --- a/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj +++ b/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj @@ -11,7 +11,7 @@ Microsoft.Build.Tasks.CodeAnalysis.UnitTests true net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Compilers/Extension/CompilerExtension.csproj b/src/Compilers/Extension/CompilerExtension.csproj index 0dd7cec846b2c..f772d067ac508 100644 --- a/src/Compilers/Extension/CompilerExtension.csproj +++ b/src/Compilers/Extension/CompilerExtension.csproj @@ -9,7 +9,7 @@ Roslyn.Compilers.Extension Roslyn.Compilers.Extension net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) True true true diff --git a/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj b/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj index 05107a0d2c139..5a23967697d54 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj +++ b/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj @@ -9,7 +9,7 @@ Library Roslyn.Compilers.VisualBasic.CommandLine.UnitTests net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj b/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj index f67f6ee0d5979..79fe6d6a9a30a 100644 --- a/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj @@ -9,7 +9,7 @@ Library Roslyn.Compilers.VisualBasic.Emit.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj b/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj index 20b8279dc481e..9d8d5425a492d 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj @@ -9,7 +9,7 @@ Library Roslyn.Compilers.VisualBasic.Semantic.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj b/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj index 256c0f44bb8bf..f6b9d9e0030a2 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj @@ -9,7 +9,7 @@ Library Roslyn.Compilers.VisualBasic.Symbol.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj b/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj index 2596d217c715b..a29faa5e5f0f9 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj @@ -9,7 +9,7 @@ Library Roslyn.Compilers.VisualBasic.Syntax.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Deployment/Roslyn.csproj b/src/Deployment/Roslyn.csproj index 21e4a19b81779..4f73b8a9ed87b 100644 --- a/src/Deployment/Roslyn.csproj +++ b/src/Deployment/Roslyn.csproj @@ -8,7 +8,7 @@ Library RoslynDeployment net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) false false false diff --git a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj index 7e61f01a1427e..faa61abf82969 100644 --- a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj +++ b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj @@ -5,7 +5,7 @@ net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) diff --git a/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj b/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj index 7f3508ecee42c..691e5100fc87a 100644 --- a/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj +++ b/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj @@ -5,7 +5,7 @@ net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) diff --git a/src/EditorFeatures/Test/EditorServicesTest.csproj b/src/EditorFeatures/Test/EditorServicesTest.csproj index 13c7cc64a2b04..a1fb8b5cfd659 100644 --- a/src/EditorFeatures/Test/EditorServicesTest.csproj +++ b/src/EditorFeatures/Test/EditorServicesTest.csproj @@ -10,7 +10,7 @@ Microsoft.CodeAnalysis.Editor.UnitTests Roslyn.Services.Editor.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/EditorFeatures/Test2/EditorServicesTest2.vbproj b/src/EditorFeatures/Test2/EditorServicesTest2.vbproj index 23c3d2c7c81fa..930a3cb4fee4d 100644 --- a/src/EditorFeatures/Test2/EditorServicesTest2.vbproj +++ b/src/EditorFeatures/Test2/EditorServicesTest2.vbproj @@ -10,7 +10,7 @@ Roslyn.Services.Editor2.UnitTests Off net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj b/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj index 2ef7d07419978..465d05b849202 100644 --- a/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj +++ b/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj @@ -9,7 +9,7 @@ Library Roslyn.Services.Test.Utilities2 net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) diff --git a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj index 2c44a19b86b0f..e28e6b1ae0120 100644 --- a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj +++ b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj @@ -11,7 +11,7 @@ Off Default net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj index 744c214bf60ea..6cc8ffedf346b 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj @@ -10,7 +10,7 @@ Microsoft.CodeAnalysis.CSharp.UnitTests Roslyn.ExpressionEvaluator.CSharp.ExpressionCompiler.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest true diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj index 3d4f1da0ab04c..2e6120f43f3e5 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj @@ -10,7 +10,7 @@ Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator Roslyn.ExpressionEvaluator.CSharp.ResultProvider.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest true diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj b/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj index 83da0f1501446..5e745384846d7 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj @@ -11,7 +11,7 @@ Roslyn.ExpressionEvaluator.FunctionResolver.UnitTests true net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj index 1ab80d2f31e60..916e59672a222 100644 --- a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj +++ b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj @@ -14,7 +14,7 @@ true ExpressionEvaluatorPackage.vsix net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) Vsix true CommonExtensions diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj index 482b527a553b8..ed6f9eafcf686 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj @@ -9,7 +9,7 @@ Library Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj index b1f53bfe71db7..af27b504e6764 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj @@ -9,7 +9,7 @@ Library Roslyn.ExpressionEvaluator.VisualBasic.ResultProvider.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) Default UnitTest diff --git a/src/Interactive/Host/InteractiveHost.csproj b/src/Interactive/Host/InteractiveHost.csproj index 4978335061628..cd4aa28b66c24 100644 --- a/src/Interactive/Host/InteractiveHost.csproj +++ b/src/Interactive/Host/InteractiveHost.csproj @@ -8,7 +8,7 @@ AnyCPU Exe net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) diff --git a/src/Interactive/HostTest/InteractiveHostTest.csproj b/src/Interactive/HostTest/InteractiveHostTest.csproj index 57944c78e6df2..8115deef3369e 100644 --- a/src/Interactive/HostTest/InteractiveHostTest.csproj +++ b/src/Interactive/HostTest/InteractiveHostTest.csproj @@ -10,7 +10,7 @@ Roslyn.InteractiveHost.UnitTests Roslyn.InteractiveHost.UnitTests net461 - win-x86 + $(RoslynDesktopRuntimeIdentifierX86) UnitTest diff --git a/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj b/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj index e4023a2da1309..ad344b750baaa 100644 --- a/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj +++ b/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj @@ -4,7 +4,7 @@ net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Vsix/CSharpAnalyzers.Vsix.csproj b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Vsix/CSharpAnalyzers.Vsix.csproj index f40ac686d163e..634f1374d7df2 100644 --- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Vsix/CSharpAnalyzers.Vsix.csproj +++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Vsix/CSharpAnalyzers.Vsix.csproj @@ -7,7 +7,7 @@ AnyCPU Library CSharpAnalyzers - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) net46 True false diff --git a/src/Samples/CSharp/ConsoleClassifier/ConsoleClassifierCS.csproj b/src/Samples/CSharp/ConsoleClassifier/ConsoleClassifierCS.csproj index efcec425a6e67..8ad48391e6e0f 100644 --- a/src/Samples/CSharp/ConsoleClassifier/ConsoleClassifierCS.csproj +++ b/src/Samples/CSharp/ConsoleClassifier/ConsoleClassifierCS.csproj @@ -12,7 +12,7 @@ Exe ConsoleClassifier net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true CSharp\ConsoleClassifier diff --git a/src/Samples/CSharp/ConvertToAutoProperty/ConvertToAutoPropertyCS.csproj b/src/Samples/CSharp/ConvertToAutoProperty/ConvertToAutoPropertyCS.csproj index 1b2c66678a0cc..52e17cc915d5c 100644 --- a/src/Samples/CSharp/ConvertToAutoProperty/ConvertToAutoPropertyCS.csproj +++ b/src/Samples/CSharp/ConvertToAutoProperty/ConvertToAutoPropertyCS.csproj @@ -17,7 +17,7 @@ AnyCPU Library net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true false RoslynDev diff --git a/src/Samples/CSharp/ConvertToConditional/Impl/ConvertToConditionalCS.csproj b/src/Samples/CSharp/ConvertToConditional/Impl/ConvertToConditionalCS.csproj index 60605dc1bbbce..d7715a2401302 100644 --- a/src/Samples/CSharp/ConvertToConditional/Impl/ConvertToConditionalCS.csproj +++ b/src/Samples/CSharp/ConvertToConditional/Impl/ConvertToConditionalCS.csproj @@ -17,7 +17,7 @@ AnyCPU Library net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true false RoslynDev diff --git a/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj b/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj index 1d2059e326822..6ed6b03194cbb 100644 --- a/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj +++ b/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj @@ -8,7 +8,7 @@ AnyCPU Library net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Samples/CSharp/CopyPasteWithUsing/CopyPasteWithUsing.csproj b/src/Samples/CSharp/CopyPasteWithUsing/CopyPasteWithUsing.csproj index 9391d870c19bc..7ce2c7eccf960 100644 --- a/src/Samples/CSharp/CopyPasteWithUsing/CopyPasteWithUsing.csproj +++ b/src/Samples/CSharp/CopyPasteWithUsing/CopyPasteWithUsing.csproj @@ -20,7 +20,7 @@ Roslyn.Samples.CodeAction.CopyPasteWithUsing Roslyn.Samples.CodeAction.CopyPasteWithUsing net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true false RoslynDev diff --git a/src/Samples/CSharp/FormatSolution/FormatSolutionCS.csproj b/src/Samples/CSharp/FormatSolution/FormatSolutionCS.csproj index d5ce718d65706..643909d6a90a4 100644 --- a/src/Samples/CSharp/FormatSolution/FormatSolutionCS.csproj +++ b/src/Samples/CSharp/FormatSolution/FormatSolutionCS.csproj @@ -9,7 +9,7 @@ FormatSolution FormatSolution net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) CSharp\FormatSolution true diff --git a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedCS.csproj b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedCS.csproj index 53975c7369011..77c77e97902dc 100644 --- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedCS.csproj +++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedCS.csproj @@ -19,7 +19,7 @@ AnyCPU Library net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true false true diff --git a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj index 173ea5f89b75d..4c78fe0fc564f 100644 --- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj +++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj @@ -9,7 +9,7 @@ AnyCPU Library net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Samples/CSharp/MakeConst/Impl/MakeConstCS.csproj b/src/Samples/CSharp/MakeConst/Impl/MakeConstCS.csproj index 017a569dbc10e..e36e9d2912121 100644 --- a/src/Samples/CSharp/MakeConst/Impl/MakeConstCS.csproj +++ b/src/Samples/CSharp/MakeConst/Impl/MakeConstCS.csproj @@ -18,7 +18,7 @@ AnyCPU Library net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true false RoslynDev diff --git a/src/Samples/CSharp/RefOutModifier/AddOrRemoveRefOutModifier.csproj b/src/Samples/CSharp/RefOutModifier/AddOrRemoveRefOutModifier.csproj index 831e8fdeca9bf..ae79278ef8546 100644 --- a/src/Samples/CSharp/RefOutModifier/AddOrRemoveRefOutModifier.csproj +++ b/src/Samples/CSharp/RefOutModifier/AddOrRemoveRefOutModifier.csproj @@ -19,7 +19,7 @@ Roslyn.Samples.CodeAction.AddOrRemoveRefOutModifier Roslyn.Samples.CodeAction.AddOrRemoveRefOutModifier net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true false RoslynDev diff --git a/src/Samples/CSharp/TreeTransforms/TreeTransformsCS.csproj b/src/Samples/CSharp/TreeTransforms/TreeTransformsCS.csproj index 833667d340f39..e0eae1d6f3912 100644 --- a/src/Samples/CSharp/TreeTransforms/TreeTransformsCS.csproj +++ b/src/Samples/CSharp/TreeTransforms/TreeTransformsCS.csproj @@ -8,7 +8,7 @@ 8.0.30703 Exe net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifierX86) true diff --git a/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj b/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj index 9f01a562710bf..500898529ad66 100644 --- a/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj +++ b/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj @@ -11,7 +11,7 @@ Roslyn.UnitTestFramework Roslyn.UnitTestFramework net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) diff --git a/src/Samples/VisualBasic/APISampleUnitTests/APISampleUnitTestsVB.vbproj b/src/Samples/VisualBasic/APISampleUnitTests/APISampleUnitTestsVB.vbproj index 925d2371e44ee..c775580193eca 100644 --- a/src/Samples/VisualBasic/APISampleUnitTests/APISampleUnitTestsVB.vbproj +++ b/src/Samples/VisualBasic/APISampleUnitTests/APISampleUnitTestsVB.vbproj @@ -4,7 +4,7 @@ net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Vsix/BasicAnalyzers.Vsix.vbproj b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Vsix/BasicAnalyzers.Vsix.vbproj index 348bfb33014cd..a2ea5ece6651d 100644 --- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Vsix/BasicAnalyzers.Vsix.vbproj +++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Vsix/BasicAnalyzers.Vsix.vbproj @@ -7,7 +7,7 @@ AnyCPU Library BasicAnalyzers - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) net46 True false diff --git a/src/Samples/VisualBasic/ConsoleClassifier/ConsoleClassifierVB.vbproj b/src/Samples/VisualBasic/ConsoleClassifier/ConsoleClassifierVB.vbproj index 46aeba727df9d..cae2536c3d9d1 100644 --- a/src/Samples/VisualBasic/ConsoleClassifier/ConsoleClassifierVB.vbproj +++ b/src/Samples/VisualBasic/ConsoleClassifier/ConsoleClassifierVB.vbproj @@ -13,7 +13,7 @@ ConsoleClassifier Console net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) VisualBasic\ConsoleClassifier true Off diff --git a/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/ConvertToAutoPropertyVB.vbproj b/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/ConvertToAutoPropertyVB.vbproj index e9ee70f7b009c..8d1306d95caf4 100644 --- a/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/ConvertToAutoPropertyVB.vbproj +++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/ConvertToAutoPropertyVB.vbproj @@ -16,7 +16,7 @@ Library ConvertToAutoPropertyVB net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true false true diff --git a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj index 24e9dd23787c2..7e24d305f5416 100644 --- a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj +++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj @@ -11,7 +11,7 @@ Windows Off net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest $(NoWarn);41999,42016,42030,42104,42108,42109 41998,42004,42020,42021,42022,42026,42029,42031,42105,42106,42107,42353,42354,42355 diff --git a/src/Samples/VisualBasic/FormatSolution/FormatSolutionVB.vbproj b/src/Samples/VisualBasic/FormatSolution/FormatSolutionVB.vbproj index 30a9e32ca5006..0788418e2473b 100644 --- a/src/Samples/VisualBasic/FormatSolution/FormatSolutionVB.vbproj +++ b/src/Samples/VisualBasic/FormatSolution/FormatSolutionVB.vbproj @@ -10,7 +10,7 @@ FormatSolution Console net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) VisualBasic\FormatSolution true Off diff --git a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedVB.vbproj b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedVB.vbproj index 4dc93f3d001eb..80762293b3428 100644 --- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedVB.vbproj +++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/ImplementNotifyPropertyChangedVB.vbproj @@ -16,7 +16,7 @@ Library Roslyn.Samples.ImplementNotifyPropertyChangedVB net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true false true diff --git a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj index da07176de7b2b..16296d08098b2 100644 --- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj +++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj @@ -10,7 +10,7 @@ ImplementNotifyPropertyChangedVB.UnitTests Default net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Samples/VisualBasic/MakeConst/Impl/MakeConstVB.vbproj b/src/Samples/VisualBasic/MakeConst/Impl/MakeConstVB.vbproj index ef0917f04603f..c444a0d6b984c 100644 --- a/src/Samples/VisualBasic/MakeConst/Impl/MakeConstVB.vbproj +++ b/src/Samples/VisualBasic/MakeConst/Impl/MakeConstVB.vbproj @@ -19,7 +19,7 @@ Library MakeConstVB net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) false true false diff --git a/src/Samples/VisualBasic/RemoveByVal/Impl/RemoveByValVB.vbproj b/src/Samples/VisualBasic/RemoveByVal/Impl/RemoveByValVB.vbproj index cb5863db6bdff..26fc059df0c24 100644 --- a/src/Samples/VisualBasic/RemoveByVal/Impl/RemoveByValVB.vbproj +++ b/src/Samples/VisualBasic/RemoveByVal/Impl/RemoveByValVB.vbproj @@ -17,7 +17,7 @@ Library RemoveByValVB net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) false true true diff --git a/src/Samples/VisualBasic/RemoveByVal/Test/RemoveByValVB.UnitTests.vbproj b/src/Samples/VisualBasic/RemoveByVal/Test/RemoveByValVB.UnitTests.vbproj index ad4c7e0b96465..d4481d8d42f5f 100644 --- a/src/Samples/VisualBasic/RemoveByVal/Test/RemoveByValVB.UnitTests.vbproj +++ b/src/Samples/VisualBasic/RemoveByVal/Test/RemoveByValVB.UnitTests.vbproj @@ -11,7 +11,7 @@ Windows Off net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest $(NoWarn);41999,42016,42030,42104,42108,42109 41998,42004,42020,42021,42022,42026,42029,42031,42105,42106,42107,42353,42354,42355 diff --git a/src/Samples/VisualBasic/TreeTransforms/TreeTransformsVB.vbproj b/src/Samples/VisualBasic/TreeTransforms/TreeTransformsVB.vbproj index 3dd8fad22bce6..e07e1b4b54061 100644 --- a/src/Samples/VisualBasic/TreeTransforms/TreeTransformsVB.vbproj +++ b/src/Samples/VisualBasic/TreeTransforms/TreeTransformsVB.vbproj @@ -11,7 +11,7 @@ TreeTransformsVB Console net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifierX86) true Off $(NoWarn);42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 diff --git a/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj b/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj index a580c6b030b5c..65190e57afbae 100644 --- a/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj +++ b/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj @@ -11,7 +11,7 @@ Microsoft.CodeAnalysis.CSharp.Scripting.Desktop.UnitTests true net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj b/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj index 68eb16c929119..a9ae7d7137c4b 100644 --- a/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj +++ b/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj @@ -11,7 +11,7 @@ Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests true net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj b/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj index d7ac6a07af3f6..bb233c1697ef5 100644 --- a/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj +++ b/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj @@ -11,7 +11,7 @@ Microsoft.CodeAnalysis.VisualBasic.Scripting.Desktop.UnitTests true net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj index 63bbcaa6f98c1..b1a26bed9cb6b 100644 --- a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj +++ b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj @@ -11,8 +11,8 @@ Roslyn.BuildDevDivInsertionFiles Roslyn.BuildDevDivInsertionFiles v4.6 - $(RoslynDesktopRuntimeIdentifiers) - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) + $(RoslynDesktopRuntimeIdentifier) true Off diff --git a/src/Setup/Templates/Templates.csproj b/src/Setup/Templates/Templates.csproj index aa5e2f4c4862c..501111efc120a 100644 --- a/src/Setup/Templates/Templates.csproj +++ b/src/Setup/Templates/Templates.csproj @@ -21,8 +21,8 @@ true $(VisualStudioVersion) v4.6.1 - $(RoslynDesktopRuntimeIdentifiers) - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) + $(RoslynDesktopRuntimeIdentifier) Vsix diff --git a/src/Test/Perf/StackDepthTest/StackDepthTest.csproj b/src/Test/Perf/StackDepthTest/StackDepthTest.csproj index c80fd604e4e3f..21da3c56c8ea8 100644 --- a/src/Test/Perf/StackDepthTest/StackDepthTest.csproj +++ b/src/Test/Perf/StackDepthTest/StackDepthTest.csproj @@ -6,7 +6,7 @@ AnyCPU Exe net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true true diff --git a/src/Tools/BuildBoss/BuildBoss.csproj b/src/Tools/BuildBoss/BuildBoss.csproj index e975cdcc24223..21bc2f1b2e907 100644 --- a/src/Tools/BuildBoss/BuildBoss.csproj +++ b/src/Tools/BuildBoss/BuildBoss.csproj @@ -7,7 +7,7 @@ AnyCPU Exe net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) false true diff --git a/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj b/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj index 16e223c989ec0..7e3a3e6d807cb 100644 --- a/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj +++ b/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj @@ -8,7 +8,7 @@ AnyCPU Exe net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true false diff --git a/src/Tools/RepoUtil/RepoUtil.csproj b/src/Tools/RepoUtil/RepoUtil.csproj index e981803b2cfb5..cd2132e19ff86 100644 --- a/src/Tools/RepoUtil/RepoUtil.csproj +++ b/src/Tools/RepoUtil/RepoUtil.csproj @@ -7,7 +7,7 @@ AnyCPU Exe net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) false publish\ true diff --git a/src/Tools/RoslynPublish/RoslynPublish.csproj b/src/Tools/RoslynPublish/RoslynPublish.csproj index 2f8d12be13408..db68dd655d860 100644 --- a/src/Tools/RoslynPublish/RoslynPublish.csproj +++ b/src/Tools/RoslynPublish/RoslynPublish.csproj @@ -9,7 +9,7 @@ RoslynPublish RoslynPublish net462 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) false true true diff --git a/src/Tools/Source/RunTests/RunTests.csproj b/src/Tools/Source/RunTests/RunTests.csproj index e565018b577e4..e4e76ec603595 100644 --- a/src/Tools/Source/RunTests/RunTests.csproj +++ b/src/Tools/Source/RunTests/RunTests.csproj @@ -8,7 +8,7 @@ AnyCPU Exe net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true false diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/SyntaxVisualizerControl.csproj b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/SyntaxVisualizerControl.csproj index 181839d5eeb72..631bdb4e9a0e6 100644 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/SyntaxVisualizerControl.csproj +++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/SyntaxVisualizerControl.csproj @@ -12,7 +12,7 @@ Roslyn.SyntaxVisualizer.Control false v4.6.1 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/SyntaxVisualizerDgmlHelper.vbproj b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/SyntaxVisualizerDgmlHelper.vbproj index e40f750baa620..de8e04d2d52c6 100644 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/SyntaxVisualizerDgmlHelper.vbproj +++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/SyntaxVisualizerDgmlHelper.vbproj @@ -11,7 +11,7 @@ Roslyn.SyntaxVisualizer.DgmlHelper false v4.6.1 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/SyntaxVisualizerExtension.csproj b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/SyntaxVisualizerExtension.csproj index 0088fc4e26c38..0334495601f06 100644 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/SyntaxVisualizerExtension.csproj +++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/SyntaxVisualizerExtension.csproj @@ -26,7 +26,7 @@ false $(VisualStudioVersion) v4.6.1 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) diff --git a/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj b/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj index f9736b699aa8c..6f673cff20149 100644 --- a/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj +++ b/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj @@ -10,7 +10,7 @@ Roslyn.VisualStudio.CSharp.UnitTests Roslyn.VisualStudio.CSharp.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj b/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj index 1fb55c98d380c..1cb15c70a3a41 100644 --- a/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj +++ b/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj @@ -10,7 +10,7 @@ Roslyn.VisualStudio.Next.UnitTests Roslyn.VisualStudio.Next.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true UnitTest diff --git a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj index 4b497436620bd..fb6c1799e1cd6 100644 --- a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj +++ b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj @@ -9,7 +9,7 @@ Library Roslyn.VisualStudio.Services.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true UnitTest true diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj index e8ec84d8793b2..a5f440b9124fe 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj @@ -5,7 +5,7 @@ x86 x86 - win-x86 + $(RoslynDesktopRuntimeIdentifierX86) Library Roslyn.VisualStudio.IntegrationTests Roslyn.VisualStudio.IntegrationTests diff --git a/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj b/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj index b054d61aceeef..7ea87a0e0eadc 100644 --- a/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj +++ b/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj @@ -9,7 +9,7 @@ Microsoft.VisualStudio.IntegrationTest.Setup Microsoft.VisualStudio.IntegrationTest.Setup net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifierX86) true Vsix true diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj index 9aef1b477aba1..a240795764676 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj +++ b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj @@ -9,7 +9,7 @@ Microsoft.VisualStudio.IntegrationTest.Utilities Microsoft.VisualStudio.IntegrationTest.Utilities net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifierX86) true diff --git a/src/VisualStudio/RemoteHostClientMock/RemoteHostClientMock.csproj b/src/VisualStudio/RemoteHostClientMock/RemoteHostClientMock.csproj index 05bd703d0f160..00a9c8e7a7c01 100644 --- a/src/VisualStudio/RemoteHostClientMock/RemoteHostClientMock.csproj +++ b/src/VisualStudio/RemoteHostClientMock/RemoteHostClientMock.csproj @@ -19,7 +19,7 @@ true Roslyn.VisualStudio.RemoteHostClientMock.vsix net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) Vsix true diff --git a/src/VisualStudio/Setup.Dependencies/VisualStudioSetup.Dependencies.csproj b/src/VisualStudio/Setup.Dependencies/VisualStudioSetup.Dependencies.csproj index 40cdff3acc10e..26c386e5a95b7 100644 --- a/src/VisualStudio/Setup.Dependencies/VisualStudioSetup.Dependencies.csproj +++ b/src/VisualStudio/Setup.Dependencies/VisualStudioSetup.Dependencies.csproj @@ -15,7 +15,7 @@ false true net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) Vsix true CommonExtensions diff --git a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj index d478197f125c6..0455fc18a570c 100644 --- a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj +++ b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj @@ -15,7 +15,7 @@ false true net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) Vsix true CommonExtensions diff --git a/src/VisualStudio/Setup/VisualStudioSetup.csproj b/src/VisualStudio/Setup/VisualStudioSetup.csproj index b4f582854e490..3f783d82eee75 100644 --- a/src/VisualStudio/Setup/VisualStudioSetup.csproj +++ b/src/VisualStudio/Setup/VisualStudioSetup.csproj @@ -15,7 +15,7 @@ false true net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) Vsix true CommonExtensions diff --git a/src/VisualStudio/TestUtilities2/VisualStudioTestUtilities2.vbproj b/src/VisualStudio/TestUtilities2/VisualStudioTestUtilities2.vbproj index eadb5a420f2c5..b713f039b8546 100644 --- a/src/VisualStudio/TestUtilities2/VisualStudioTestUtilities2.vbproj +++ b/src/VisualStudio/TestUtilities2/VisualStudioTestUtilities2.vbproj @@ -9,7 +9,7 @@ Library Roslyn.VisualStudio.Test.Utilities2 net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) true diff --git a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj index ece0847981e59..e42104c920687 100644 --- a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj +++ b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj @@ -19,7 +19,7 @@ true Roslyn.VisualStudio.DiagnosticsWindow.vsix net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) Vsix diff --git a/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj b/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj index 3113c39210466..4cf8ec6d56a9f 100644 --- a/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj +++ b/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj @@ -16,7 +16,7 @@ $(VisualStudioVersion) true net461 - win + $(RoslynDesktopRuntimeIdentifier) Vsix true CommonExtensions diff --git a/src/Workspaces/CSharpTest/CSharpServicesTest.csproj b/src/Workspaces/CSharpTest/CSharpServicesTest.csproj index 203b520998dff..ecad64dff3fb3 100644 --- a/src/Workspaces/CSharpTest/CSharpServicesTest.csproj +++ b/src/Workspaces/CSharpTest/CSharpServicesTest.csproj @@ -10,7 +10,7 @@ Microsoft.CodeAnalysis.CSharp.UnitTests Roslyn.Services.CSharp.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Workspaces/CoreTest/ServicesTest.csproj b/src/Workspaces/CoreTest/ServicesTest.csproj index 981e79834c599..74a03b4b3406a 100644 --- a/src/Workspaces/CoreTest/ServicesTest.csproj +++ b/src/Workspaces/CoreTest/ServicesTest.csproj @@ -10,7 +10,7 @@ Microsoft.CodeAnalysis.UnitTests Roslyn.Services.UnitTests net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest diff --git a/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj b/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj index 506d6473a8c32..9ee1ad015685f 100644 --- a/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj +++ b/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj @@ -10,7 +10,7 @@ Microsoft.CodeAnalysis.UnitTests Roslyn.Services.UnitTests.Utilities net46 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) diff --git a/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj b/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj index 5db7c5170ff42..4c62f65883eac 100644 --- a/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj +++ b/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj @@ -11,7 +11,7 @@ Off Default net461 - $(RoslynDesktopRuntimeIdentifiers) + $(RoslynDesktopRuntimeIdentifier) UnitTest