提交 d98f9ecf 编写于 作者: J Jared Parsons

Moved a lot more projects to net461

The continued mixing of assets between net46 and net461 was causing a
huge number of binding redirect issues in our test assets. Need to move
everything to a consistent 461 to avoid this.
上级 6e3cc248
......@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.Test.Utilities</RootNamespace>
<AssemblyName>Roslyn.Services.Test.Utilities</AssemblyName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
......
......@@ -8,7 +8,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<OutputType>Library</OutputType>
<AssemblyName>Roslyn.Services.Test.Utilities2</AssemblyName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
<RuntimeIdentifiers>win7</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup Label="Project References">
......
......@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.Editor.CSharp</RootNamespace>
<AssemblyName>Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures</AssemblyName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj" />
......@@ -70,4 +70,4 @@
<PublicAPI Include="PublicAPI.Unshipped.txt" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
......@@ -7,7 +7,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<OutputType>Library</OutputType>
<AssemblyName>Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures</AssemblyName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj" />
......@@ -78,4 +78,4 @@
<PublicAPI Include="PublicAPI.Unshipped.txt" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
......@@ -6,7 +6,7 @@
<Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
<PlatformTarget>AnyCPU</PlatformTarget>
<OutputType>Exe</OutputType>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
<RuntimeIdentifiers>win7</RuntimeIdentifiers>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
......@@ -21,4 +21,4 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<Import Project="..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
......@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Roslyn.Hosting.Diagnostics</RootNamespace>
<AssemblyName>Roslyn.Hosting.Diagnostics</AssemblyName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
......@@ -48,4 +48,4 @@
</Page>
</ItemGroup>
<Import Project="..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
......@@ -15,7 +15,7 @@
<CreateVsixContainer>false</CreateVsixContainer>
<DeployExtension>false</DeployExtension>
<ImportVSSDKTargets>true</ImportVSSDKTargets>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
......@@ -74,4 +74,4 @@
<PublicAPI Include="PublicAPI.Unshipped.txt" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
......@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.VisualStudio.IntegrationTest.Setup</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.IntegrationTest.Setup</AssemblyName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
<RuntimeIdentifiers>win7-x86</RuntimeIdentifiers>
<Nonshipping>true</Nonshipping>
<RoslynProjectType>Vsix</RoslynProjectType>
......@@ -80,4 +80,4 @@
<VSIXSourceItem Include="$(OutputPath)Microsoft.VisualStudio.CodingConventions.dll" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
......@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.VisualStudio.IntegrationTest.Utilities</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.IntegrationTest.Utilities</AssemblyName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
<RuntimeIdentifiers>win7-x86</RuntimeIdentifiers>
<Nonshipping>true</Nonshipping>
</PropertyGroup>
......
......@@ -18,7 +18,7 @@
<VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
<ImportVSSDKTargets>true</ImportVSSDKTargets>
<TargetVsixContainerName>Roslyn.VisualStudio.RemoteHostClientMock.vsix</TargetVsixContainerName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
<RuntimeIdentifiers>win7</RuntimeIdentifiers>
<RoslynProjectType>Vsix</RoslynProjectType>
</PropertyGroup>
......
......@@ -8,7 +8,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<OutputType>Library</OutputType>
<AssemblyName>Roslyn.VisualStudio.Test.Utilities2</AssemblyName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
<RuntimeIdentifiers>win7</RuntimeIdentifiers>
<ForceGenerationOfBindingRedirects>true</ForceGenerationOfBindingRedirects>
</PropertyGroup>
......
......@@ -11,7 +11,7 @@
<CreateVsixContainer>false</CreateVsixContainer>
<DeployExtension>false</DeployExtension>
<ImportVSSDKTargets>true</ImportVSSDKTargets>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
......@@ -69,4 +69,4 @@
<PublicAPI Include="PublicAPI.Shipped.txt" />
</ItemGroup>
<Import Project="..\..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
......@@ -18,7 +18,7 @@
<VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
<ImportVSSDKTargets>true</ImportVSSDKTargets>
<TargetVsixContainerName>Roslyn.VisualStudio.DiagnosticsWindow.vsix</TargetVsixContainerName>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
<RuntimeIdentifiers>win7</RuntimeIdentifiers>
<RoslynProjectType>Vsix</RoslynProjectType>
</PropertyGroup>
......@@ -114,4 +114,4 @@
</Page>
</ItemGroup>
<Import Project="..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
......@@ -15,7 +15,7 @@
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
<MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
<ImportVSSDKTargets>true</ImportVSSDKTargets>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net461</TargetFramework>
<RuntimeIdentifiers>win7</RuntimeIdentifiers>
<RoslynProjectType>Vsix</RoslynProjectType>
<IsProductComponent>true</IsProductComponent>
......@@ -205,4 +205,4 @@
<Content Include="CSharpInteractivePackageRegistration.pkgdef" />
</ItemGroup>
<Import Project="..\..\..\build\Targets\Imports.targets" />
</Project>
\ No newline at end of file
</Project>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册