Local testing

dotnet · Jun 3, 2021 · d02e4b9 · d02e4b9
1 parent 8ec21fd
commit d02e4b9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
- <Import Project="$(RepositoryEngineeringDir)CodeStyle.props" /> 
+ <Import Project="$(RepositoryEngineeringDir)CodeStyle.props" />
  <Import Project="$(RepositoryEngineeringDir)FacadeAssemblies.props" />
  <Import Project="$(RepositoryEngineeringDir)ApiCompatibility\PublicApiAnalyzer.props" />
 
@@ -16,6 +16,14 @@
  <LangVersion>preview</LangVersion>
  </PropertyGroup>
 
+ <!-- ApplicationConfiguration specific settings -->
+ <PropertyGroup>
+ <ApplicationVisualStyles>true</ApplicationVisualStyles>
+ <ApplicationFontName>Calibri</ApplicationFontName>
+ <ApplicationFontSize>11</ApplicationFontSize>
+ <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
+ </PropertyGroup>
+
  <!-- SDK flipped to 'true' by default https://github.com/dotnet/sdk/pull/12720 -->
  <PropertyGroup>
  <ProduceReferenceAssembly>false</ProduceReferenceAssembly>

diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Program.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Program.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Drawing;
 using System.Threading;
 using System.Windows.Forms;
 
@@ -17,15 +16,9 @@ static class Program
  [STAThread]
  static void Main()
  {
- Application.EnableVisualStyles();
- Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
+ ApplicationConfiguration.Initialize();
 
- //Application.SetDefaultFont(new Font(new FontFamily("Microsoft Sans Serif"), 8f));
- //Application.SetDefaultFont(new Font(new FontFamily("Chiller"), 12f));
- Application.SetDefaultFont(new Font(new FontFamily("Calibri"), 11f));
-
- Application.SetCompatibleTextRenderingDefault(false);
- Application.SetUnhandledExceptionMode(UnhandledExceptionMode.ThrowException); //UnhandledExceptionMode.ThrowException
+ Application.SetUnhandledExceptionMode(UnhandledExceptionMode.ThrowException);
  Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture;
  try
  {

diff --git a/...tem.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/WinformsControlsTest.csproj b/...tem.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/WinformsControlsTest.csproj
@@ -12,18 +12,13 @@
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
 
- <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^netcoreapp\d'))">
- <DefineConstants>NETCORE</DefineConstants>
- </PropertyGroup>
-
  <ItemGroup>
  <ProjectReference Include="..\..\..\..\System.Design\src\System.Design.Facade.csproj" />
  <ProjectReference Include="..\..\..\..\System.Windows.Forms.Design\src\System.Windows.Forms.Design.csproj" />
  <ProjectReference Include="..\..\..\src\System.Windows.Forms.csproj" />
  <ProjectReference Include="..\System.Windows.Forms.IntegrationTests.Common\System.Windows.Forms.IntegrationTests.Common.csproj" />
  </ItemGroup>
 
-
  <ItemGroup>
  <EmbeddedResource Include="Images\SmallA.bmp">
  <LogicalName>WinformsControlsTest.SmallA.bmp</LogicalName>
@@ -53,4 +48,21 @@
  </None>
  </ItemGroup>
 
+ <!--
+
+ Reference local analyzers for test purposes
+
+ -->
+ <PropertyGroup>
+ <!-- Don't try to resolve analyzers from <repo root>\.dotnet\packs\Microsoft.WindowsDesktop.App.Ref\<version>\ref\net6.0 -->
+ <ResolveWinFormsAnalyzersFromSdkRefPack>false</ResolveWinFormsAnalyzersFromSdkRefPack>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\System.Windows.Forms.Analyzers\src\System.Windows.Forms.Analyzers.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
+ <ProjectReference Include="..\..\..\..\System.Windows.Forms.Analyzers.CSharp\src\System.Windows.Forms.Analyzers.CSharp.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
+ </ItemGroup>
+
+ <Import Project="..\..\..\..\System.Windows.Forms.Analyzers\src\System.Windows.Forms.Analyzers.props" />
+
 </Project>