Fix .NET Fx tests after updates to .NET Core tests (#1214)

Fix .NET Fx tests after updates to .NET Core tests
dotnet · Jun 29, 2019 · e6eae24 · e6eae24
2 parents ad63148 + eacdfc4
commit e6eae24
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/Winforms.sln b/Winforms.sln
@@ -182,7 +182,9 @@ Global
 		{87CF8481-647B-4951-8A57-468B2F0CD84B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87CF8481-647B-4951-8A57-468B2F0CD84B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{840B70B2-4F4B-4FF0-A26F-185789625C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{840B70B2-4F4B-4FF0-A26F-185789625C78}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{840B70B2-4F4B-4FF0-A26F-185789625C78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{840B70B2-4F4B-4FF0-A26F-185789625C78}.Release|Any CPU.Build.0 = Release|Any CPU
 		{48979B4E-EAEC-4B41-BB49-44CA230BECAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{48979B4E-EAEC-4B41-BB49-44CA230BECAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{48979B4E-EAEC-4B41-BB49-44CA230BECAB}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -9,7 +9,8 @@
     <!-- Additional sources required for restore of PackageReferences -->
     <RestoreSources>
       $(RestoreSources);
-      https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json
+      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
+      https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json;
     </RestoreSources>
   </PropertyGroup>
   <!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->

diff --git a/...s/tests/IntegrationTests/WinFormsControlsClassicTests/WinFormsControlsClassicTests.csproj b/...s/tests/IntegrationTests/WinFormsControlsClassicTests/WinFormsControlsClassicTests.csproj
@@ -17,7 +17,15 @@
     <NonShipping>true</NonShipping>
     <EnableXlfLocalization>false</EnableXlfLocalization>
     <UpdateXlfOnBuild>false</UpdateXlfOnBuild>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
+
+  <!-- Useless stuff to make Arcade SDK happy -->
+  <PropertyGroup>
+    <Language>msbuild</Language>
+  </PropertyGroup>
+  <Target Name="Pack"/>
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
@@ -28,6 +36,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <LangVersion>latest</LangVersion>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <DocumentationFile>bin\WinFormsControlsClassicTests.xml</DocumentationFile>
+    <NoWarn>$(NoWarn),1573,1591,1712</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -37,6 +48,10 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <DocumentationFile>bin\WinFormsControlsClassicTests.xml</DocumentationFile>
+    <NoWarn>$(NoWarn),1573,1591,1712</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
@@ -59,6 +74,15 @@
     <Compile Include="..\..\..\..\Common\src\Interop\Interop.WindowMessages.cs">
       <Link>Interop.WindowMessages.cs</Link>
     </Compile>
+    <Compile Include="..\System.Windows.Forms.IntegrationTests.Common\ExternalTestHelpers.cs">
+      <Link>ExternalTestHelpers.cs</Link>
+    </Compile>
+    <Compile Include="..\System.Windows.Forms.IntegrationTests.Common\MainFormControlsTabOrder.cs">
+      <Link>MainFormControlsTabOrder.cs</Link>
+    </Compile>
+    <Compile Include="..\System.Windows.Forms.IntegrationTests.Common\TestHelpers.cs">
+      <Link>TestHelpers.cs</Link>
+    </Compile>
     <Compile Include="..\WinformsControlsTest\Buttons.cs">
       <Link>Buttons.cs</Link>
       <SubType>Form</SubType>
@@ -286,5 +310,10 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>9.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>