Skip to content

Commit 05c9f1f

Browse files
Fix merge issues.
1 parent 8df6846 commit 05c9f1f

File tree

3 files changed

+36
-2
lines changed

3 files changed

+36
-2
lines changed

src/Microsoft.VisualBasic.Forms/src/Microsoft.VisualBasic.Forms.vbproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AssemblyName>Microsoft.VisualBasic.Forms</AssemblyName>
1010
<Deterministic>true</Deterministic>
1111
<RootNamespace></RootNamespace>
12-
<LangVersion>15.0</LangVersion>
12+
<LangVersion>15.5</LangVersion>
1313
<VBRuntime>None</VBRuntime>
1414
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
1515
<UsePublicApiAnalyzers>true</UsePublicApiAnalyzers>

src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System/Windows/Forms/Generators/ApplicationConfigurationInitializeBuilderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System.Globalization;
5-
using System.Windows.Forms.Analyzers;
5+
using System.Windows.Forms.CSharp.Generators.ApplicationConfiguration;
66
using static System.Windows.Forms.Analyzers.ApplicationConfig;
77

88
namespace System.Windows.Forms.Analyzers.Tests;
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<RootNamespace>System.Windows.Forms.Analyzers</RootNamespace>
5+
<TargetFramework>netstandard2.0</TargetFramework>
6+
<Deterministic>true</Deterministic>
7+
<RootNamespace></RootNamespace>
8+
<LangVersion>15.5</LangVersion>
9+
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
17+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisVisualBasicPackageVersion)" />
18+
19+
<AdditionalFiles Include="$(ProjectDir)AnalyzerReleases.Unshipped.md" />
20+
<AdditionalFiles Include="$(ProjectDir)AnalyzerReleases.Shipped.md" />
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<ProjectReference Include="..\..\src\System.Windows.Forms.Analyzers\src\System.Windows.Forms.Analyzers.csproj" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<EmbeddedResource Update="Resources\SR.resx">
29+
<GenerateSource>true</GenerateSource>
30+
<Namespace>System.Windows.Forms.Analyzers.VisualBasic.Resources</Namespace>
31+
</EmbeddedResource>
32+
</ItemGroup>
33+
34+
</Project>

0 commit comments

Comments
 (0)