Skip to content

Commit f57ed69

Browse files
authored
Remove workaround for HeatWave issue (#71)
The new 1.0.5 version of HeatWave has resolved it, remove workaround.
1 parent 4868bfa commit f57ed69

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

Directory.Build.props

+1-4
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,9 @@
7171

7272
<!--
7373
Disable level All warnings that are not useful:
74-
C4005 = macro redefinition [Caused by Windows SDK + header units]
7574
C4061 = enumerator 'identifier' in switch of enum 'enumeration' is not explicitly handled by a case label
7675
C4265 = class has virtual functions, but its non-trivial destructor is not virtual; instances of this class may not be destructed correctly [Needed for WinRT]
7776
C4365 = action' : conversion from 'type_1' to 'type_2', signed/unsigned mismatch
78-
C4464 = A #include directive has a path that includes a '..' parent directory specifier. [Just informational]
7977
C4514 = function' : unreferenced inline function has been removed [Just informational]
8078
C4571 = Informational: catch(...) semantics changed since Visual C++ 7.1; structured exceptions (SEH) are no longer caught [Just informational]
8179
C4623 = derived class' : default constructor was implicitly defined as deleted because a base class default constructor is inaccessible or deleted [Just informational]
@@ -96,8 +94,7 @@
9694
C5204 = '': class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly [needed for Winrt]
9795
C5246 = the initialization of a subobject should be wrapped in braces [Not needed for brace elision]
9896
-->
99-
<DisableSpecificWarnings>4005</DisableSpecificWarnings>
100-
<DisableSpecificWarnings Condition="'$(NETPBM_WIC_CODEC_ALL_WARNINGS)'!=''">4061;4265;4365;4464;4514;4571;4623;4625;4626;4668;4686;4710;4711;4738;4774;4820;4946;5026;5027;5039;5045;5106;5204;5246;%(DisableSpecificWarnings)</DisableSpecificWarnings>
97+
<DisableSpecificWarnings Condition="'$(NETPBM_WIC_CODEC_ALL_WARNINGS)'!=''">4061;4265;4365;4514;4571;4623;4625;4626;4668;4686;4710;4711;4738;4774;4820;4946;5026;5027;5039;5045;5106;5204;5246;%(DisableSpecificWarnings)</DisableSpecificWarnings>
10198

10299
<!--
103100
__cplusplus = Tell MSVC to use the correct value for the __cplusplus macro

netpbm-wic-codec.sln.DotSettings

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
<s:Boolean x:Key="/Default/UserDictionary/Words/=pgmfile/@EntryIndexedValue">True</s:Boolean>
3333
<s:Boolean x:Key="/Default/UserDictionary/Words/=pixmap/@EntryIndexedValue">True</s:Boolean>
3434
<s:Boolean x:Key="/Default/UserDictionary/Words/=ppmfile/@EntryIndexedValue">True</s:Boolean>
35+
<s:Boolean x:Key="/Default/UserDictionary/Words/=signtool/@EntryIndexedValue">True</s:Boolean>
3536
<s:Boolean x:Key="/Default/UserDictionary/Words/=unregister/@EntryIndexedValue">True</s:Boolean>
3637
<s:Boolean x:Key="/Default/UserDictionary/Words/=VCRUNTIME/@EntryIndexedValue">True</s:Boolean>
37-
<s:Boolean x:Key="/Default/UserDictionary/Words/=wincodec/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
38+
<s:Boolean x:Key="/Default/UserDictionary/Words/=wincodec/@EntryIndexedValue">True</s:Boolean>
39+
<s:Boolean x:Key="/Default/UserDictionary/Words/=wixext/@EntryIndexedValue">True</s:Boolean>
40+
<s:Boolean x:Key="/Default/UserDictionary/Words/=wixproj/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

setup/bootstrapper/bootstrapper.wixproj

-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,4 @@
2727
<Message Importance="high" Text="SignBundle: @(SignBundle)" />
2828
<Exec Command='signtool.exe sign /fd SHA256 /td SHA256 /v /sha1 $(_CertificateThumbprint) /tr $(_TimestampUrl) "%(SignBundle.FullPath)" ' />
2929
</Target>
30-
31-
<!-- Workaround for https://github.com/firegiant/HeatWaveSupport/issues/73 -->
32-
<Target Name="CollectSuggestedVisualStudioComponentIds" />
3330
</Project>

setup/installer/installer.wixproj

-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,4 @@
1818
<Message Importance="high" Text="SignMsi: @(SignMsi)" />
1919
<Exec Command="signtool.exe sign /fd SHA256 /td SHA256 /v /sha1 $(_CertificateThumbprint) /tr $(_TimestampUrl) &quot;%(SignMsi.FullPath)&quot; " />
2020
</Target>
21-
22-
<!-- Workaround for https://github.com/firegiant/HeatWaveSupport/issues/73 -->
23-
<Target Name="CollectSuggestedVisualStudioComponentIds" />
2421
</Project>

0 commit comments

Comments
 (0)