Skip to content

Commit e305c3c

Browse files
sailroGitHub Enterprise
authored andcommitted
Merge pull request #182 from unity/suppress-USG0001
Suppress USG0001
2 parents 4bb74a2 + ee6be9a commit e305c3c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Packages/com.unity.ide.visualstudio.tests/Tests/Editor/CSProjectTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public void DefaultSyncSettings_WhenSynced_CreatesProjectFileFromDefaultTemplate
150150
$" <DefineConstants></DefineConstants>",
151151
" <ErrorReport>prompt</ErrorReport>",
152152
" <WarningLevel>4</WarningLevel>",
153-
" <NoWarn>0169</NoWarn>",
153+
" <NoWarn>0169;USG0001</NoWarn>",
154154
" <AllowUnsafeBlocks>False</AllowUnsafeBlocks>",
155155
" </PropertyGroup>",
156156
" <PropertyGroup Condition=\" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' \">",
@@ -159,7 +159,7 @@ public void DefaultSyncSettings_WhenSynced_CreatesProjectFileFromDefaultTemplate
159159
" <OutputPath>Temp\\bin\\Release\\</OutputPath>",
160160
" <ErrorReport>prompt</ErrorReport>",
161161
" <WarningLevel>4</WarningLevel>",
162-
" <NoWarn>0169</NoWarn>",
162+
" <NoWarn>0169;USG0001</NoWarn>",
163163
" <AllowUnsafeBlocks>False</AllowUnsafeBlocks>",
164164
" </PropertyGroup>",
165165
" <PropertyGroup>",

Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/ProjectGeneration.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ internal virtual void GetProjectHeader(ProjectProperties properties, out StringB
763763

764764
internal static void GetProjectHeaderConfigurations(ProjectProperties properties, StringBuilder headerBuilder)
765765
{
766+
const string NoWarn = "0169;USG0001";
767+
766768
headerBuilder.Append(@" <PropertyGroup Condition="" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "">").Append(k_WindowsNewline);
767769
headerBuilder.Append(@" <DebugSymbols>true</DebugSymbols>").Append(k_WindowsNewline);
768770
headerBuilder.Append(@" <DebugType>full</DebugType>").Append(k_WindowsNewline);
@@ -771,7 +773,7 @@ internal static void GetProjectHeaderConfigurations(ProjectProperties properties
771773
headerBuilder.Append(@" <DefineConstants>").Append(string.Join(";", properties.Defines)).Append(@"</DefineConstants>").Append(k_WindowsNewline);
772774
headerBuilder.Append(@" <ErrorReport>prompt</ErrorReport>").Append(k_WindowsNewline);
773775
headerBuilder.Append(@" <WarningLevel>4</WarningLevel>").Append(k_WindowsNewline);
774-
headerBuilder.Append(@" <NoWarn>0169</NoWarn>").Append(k_WindowsNewline);
776+
headerBuilder.Append(@" <NoWarn>").Append(NoWarn).Append("</NoWarn>").Append(k_WindowsNewline);
775777
headerBuilder.Append(@" <AllowUnsafeBlocks>").Append(properties.Unsafe).Append(@"</AllowUnsafeBlocks>").Append(k_WindowsNewline);
776778
headerBuilder.Append(@" </PropertyGroup>").Append(k_WindowsNewline);
777779
headerBuilder.Append(@" <PropertyGroup Condition="" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "">").Append(k_WindowsNewline);
@@ -780,7 +782,7 @@ internal static void GetProjectHeaderConfigurations(ProjectProperties properties
780782
headerBuilder.Append(@" <OutputPath>Temp\bin\Release\</OutputPath>").Append(k_WindowsNewline);
781783
headerBuilder.Append(@" <ErrorReport>prompt</ErrorReport>").Append(k_WindowsNewline);
782784
headerBuilder.Append(@" <WarningLevel>4</WarningLevel>").Append(k_WindowsNewline);
783-
headerBuilder.Append(@" <NoWarn>0169</NoWarn>").Append(k_WindowsNewline);
785+
headerBuilder.Append(@" <NoWarn>").Append(NoWarn).Append("</NoWarn>").Append(k_WindowsNewline);
784786
headerBuilder.Append(@" <AllowUnsafeBlocks>").Append(properties.Unsafe).Append(@"</AllowUnsafeBlocks>").Append(k_WindowsNewline);
785787
headerBuilder.Append(@" </PropertyGroup>").Append(k_WindowsNewline);
786788
}

0 commit comments

Comments
 (0)