Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 32e28a1

Browse files
Merge branch 'master' into fixes/create-comment-just-now
2 parents 90e74d9 + 3b501b0 commit 32e28a1

File tree

68 files changed

+4957
-1260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+4957
-1260
lines changed

scripts/modules.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ New-Module -ScriptBlock {
104104
}
105105
elseif (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe") {
106106
$msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
107+
}
108+
elseif (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe") {
109+
$msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe"
107110
}
108111
else {
109112
Die("No suitable msbuild.exe found.")

src/GitHub.App/GitHub.App.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
<HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
198198
</Reference>
199199
<Reference Include="System.Web" />
200+
<Reference Include="System.Windows.Forms" />
200201
<Reference Include="System.Xaml" />
201202
<Reference Include="System.Xml.Linq" />
202203
<Reference Include="System.Data.DataSetExtensions" />
@@ -414,11 +415,17 @@
414415
</ProjectReference>
415416
</ItemGroup>
416417
<ItemGroup>
418+
<EmbeddedResource Include="Resources.en-US.resx">
419+
<DependentUpon>Resources.resx</DependentUpon>
420+
</EmbeddedResource>
417421
<EmbeddedResource Include="Resources.resx">
418422
<Generator>PublicResXFileCodeGenerator</Generator>
419423
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
420424
<SubType>Designer</SubType>
421425
</EmbeddedResource>
426+
<EmbeddedResource Include="Resources.zh-Hans.resx">
427+
<DependentUpon>Resources.resx</DependentUpon>
428+
</EmbeddedResource>
422429
</ItemGroup>
423430
<ItemGroup>
424431
<Analyzer Include="..\..\packages\SerilogAnalyzer.0.12.0.0\analyzers\dotnet\cs\SerilogAnalyzer.dll" />

0 commit comments

Comments
 (0)