Skip to content

Commit 765b48f

Browse files
gbakemangbakeman
committed
Bump v2.2.8690, build conf and cleanup
- Added a PreRelease build config to the Common library so the DEBUG constant is not defined and logging behaves like a normal release. - Attempted to clean up project references so the Setup project stops trying to include them. It helped for some of them, and nothing appears to have broken.
1 parent 103a19c commit 765b48f

File tree

3 files changed

+80
-126
lines changed

3 files changed

+80
-126
lines changed

‎WinNUT_V2/Setup/Setup.vdproj‎

Lines changed: 70 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@
5151
}
5252
"Entry"
5353
{
54-
"MsmKey" = "8:_0418C0A68EC444EE896C1D543C8AFD63"
55-
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
56-
"MsmSig" = "8:_UNDEFINED"
57-
}
58-
"Entry"
59-
{
6054
"MsmKey" = "8:_04BC2107644AB3257DDD15248220E634"
6155
"OwnerKey" = "8:_CAA83D70E80C09C89E42A34FA8F23665"
6256
"MsmSig" = "8:_UNDEFINED"
@@ -279,12 +273,6 @@
279273
}
280274
"Entry"
281275
{
282-
"MsmKey" = "8:_2A6481F0F99C80219D875FADD7CEBCF5"
283-
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
284-
"MsmSig" = "8:_UNDEFINED"
285-
}
286-
"Entry"
287-
{
288276
"MsmKey" = "8:_2FE95EC14D3C411D8F0A93940FFCBCF3"
289277
"OwnerKey" = "8:_UNDEFINED"
290278
"MsmSig" = "8:_UNDEFINED"
@@ -501,12 +489,6 @@
501489
}
502490
"Entry"
503491
{
504-
"MsmKey" = "8:_4F81608AEF82517B403CCE166E5C9E7B"
505-
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
506-
"MsmSig" = "8:_UNDEFINED"
507-
}
508-
"Entry"
509-
{
510492
"MsmKey" = "8:_4FBF49FC0C81EBB2568861BC1E029FD1"
511493
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
512494
"MsmSig" = "8:_UNDEFINED"
@@ -1647,6 +1629,12 @@
16471629
}
16481630
"Entry"
16491631
{
1632+
"MsmKey" = "8:_7643B2E01E55816C8BA2265FF9E9B786"
1633+
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
1634+
"MsmSig" = "8:_UNDEFINED"
1635+
}
1636+
"Entry"
1637+
{
16501638
"MsmKey" = "8:_76C124487B58F9503C60B5679A43F43E"
16511639
"OwnerKey" = "8:_CAA83D70E80C09C89E42A34FA8F23665"
16521640
"MsmSig" = "8:_UNDEFINED"
@@ -3021,6 +3009,12 @@
30213009
}
30223010
"Entry"
30233011
{
3012+
"MsmKey" = "8:_B8073AE507D3E3454F05FE38F157CEDD"
3013+
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
3014+
"MsmSig" = "8:_UNDEFINED"
3015+
}
3016+
"Entry"
3017+
{
30243018
"MsmKey" = "8:_B8623759245285260351785642DF324A"
30253019
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
30263020
"MsmSig" = "8:_UNDEFINED"
@@ -4990,13 +4984,13 @@
49904984
"Entry"
49914985
{
49924986
"MsmKey" = "8:_UNDEFINED"
4993-
"OwnerKey" = "8:_4F81608AEF82517B403CCE166E5C9E7B"
4987+
"OwnerKey" = "8:_B8073AE507D3E3454F05FE38F157CEDD"
49944988
"MsmSig" = "8:_UNDEFINED"
49954989
}
49964990
"Entry"
49974991
{
49984992
"MsmKey" = "8:_UNDEFINED"
4999-
"OwnerKey" = "8:_0418C0A68EC444EE896C1D543C8AFD63"
4993+
"OwnerKey" = "8:_7643B2E01E55816C8BA2265FF9E9B786"
50004994
"MsmSig" = "8:_UNDEFINED"
50014995
}
50024996
"Entry"
@@ -5548,12 +5542,6 @@
55485542
"Entry"
55495543
{
55505544
"MsmKey" = "8:_UNDEFINED"
5551-
"OwnerKey" = "8:_2A6481F0F99C80219D875FADD7CEBCF5"
5552-
"MsmSig" = "8:_UNDEFINED"
5553-
}
5554-
"Entry"
5555-
{
5556-
"MsmKey" = "8:_UNDEFINED"
55575545
"OwnerKey" = "8:_D6E439F8F358953CF705B4AFF62D3C03"
55585546
"MsmSig" = "8:_UNDEFINED"
55595547
}
@@ -6423,37 +6411,6 @@
64236411
"IsDependency" = "11:TRUE"
64246412
"IsolateTo" = "8:"
64256413
}
6426-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0418C0A68EC444EE896C1D543C8AFD63"
6427-
{
6428-
"AssemblyRegister" = "3:1"
6429-
"AssemblyIsInGAC" = "11:FALSE"
6430-
"AssemblyAsmDisplayName" = "8:AGauge, Version=2.1.8688.25884, Culture=neutral, processorArchitecture=MSIL"
6431-
"ScatterAssemblies"
6432-
{
6433-
"_0418C0A68EC444EE896C1D543C8AFD63"
6434-
{
6435-
"Name" = "8:AGauge.dll"
6436-
"Attributes" = "3:512"
6437-
}
6438-
}
6439-
"SourcePath" = "8:AGauge.dll"
6440-
"TargetName" = "8:"
6441-
"Tag" = "8:"
6442-
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
6443-
"Condition" = "8:"
6444-
"Transitive" = "11:FALSE"
6445-
"Vital" = "11:TRUE"
6446-
"ReadOnly" = "11:FALSE"
6447-
"Hidden" = "11:FALSE"
6448-
"System" = "11:FALSE"
6449-
"Permanent" = "11:FALSE"
6450-
"SharedLegacy" = "11:FALSE"
6451-
"PackageAs" = "3:1"
6452-
"Register" = "3:1"
6453-
"Exclude" = "11:TRUE"
6454-
"IsDependency" = "11:TRUE"
6455-
"IsolateTo" = "8:"
6456-
}
64576414
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_04BC2107644AB3257DDD15248220E634"
64586415
{
64596416
"AssemblyRegister" = "3:1"
@@ -7373,37 +7330,6 @@
73737330
"IsDependency" = "11:TRUE"
73747331
"IsolateTo" = "8:"
73757332
}
7376-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A6481F0F99C80219D875FADD7CEBCF5"
7377-
{
7378-
"AssemblyRegister" = "3:1"
7379-
"AssemblyIsInGAC" = "11:FALSE"
7380-
"AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
7381-
"ScatterAssemblies"
7382-
{
7383-
"_2A6481F0F99C80219D875FADD7CEBCF5"
7384-
{
7385-
"Name" = "8:System.Net.Http.dll"
7386-
"Attributes" = "3:512"
7387-
}
7388-
}
7389-
"SourcePath" = "8:System.Net.Http.dll"
7390-
"TargetName" = "8:"
7391-
"Tag" = "8:"
7392-
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
7393-
"Condition" = "8:"
7394-
"Transitive" = "11:FALSE"
7395-
"Vital" = "11:TRUE"
7396-
"ReadOnly" = "11:FALSE"
7397-
"Hidden" = "11:FALSE"
7398-
"System" = "11:FALSE"
7399-
"Permanent" = "11:FALSE"
7400-
"SharedLegacy" = "11:FALSE"
7401-
"PackageAs" = "3:1"
7402-
"Register" = "3:1"
7403-
"Exclude" = "11:TRUE"
7404-
"IsDependency" = "11:TRUE"
7405-
"IsolateTo" = "8:"
7406-
}
74077333
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2FE95EC14D3C411D8F0A93940FFCBCF3"
74087334
{
74097335
"SourcePath" = "8:..\\WinNUT-Client\\bin\\PreRelease\\WinNUT-Client_Common.pdb"
@@ -8301,37 +8227,6 @@
83018227
"IsDependency" = "11:TRUE"
83028228
"IsolateTo" = "8:"
83038229
}
8304-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4F81608AEF82517B403CCE166E5C9E7B"
8305-
{
8306-
"AssemblyRegister" = "3:1"
8307-
"AssemblyIsInGAC" = "11:FALSE"
8308-
"AssemblyAsmDisplayName" = "8:WinNUT-Client_Common, Version=2.2.8688.25884, Culture=neutral, processorArchitecture=MSIL"
8309-
"ScatterAssemblies"
8310-
{
8311-
"_4F81608AEF82517B403CCE166E5C9E7B"
8312-
{
8313-
"Name" = "8:WinNUT-Client_Common.dll"
8314-
"Attributes" = "3:512"
8315-
}
8316-
}
8317-
"SourcePath" = "8:WinNUT-Client_Common.dll"
8318-
"TargetName" = "8:"
8319-
"Tag" = "8:"
8320-
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
8321-
"Condition" = "8:"
8322-
"Transitive" = "11:FALSE"
8323-
"Vital" = "11:TRUE"
8324-
"ReadOnly" = "11:FALSE"
8325-
"Hidden" = "11:FALSE"
8326-
"System" = "11:FALSE"
8327-
"Permanent" = "11:FALSE"
8328-
"SharedLegacy" = "11:FALSE"
8329-
"PackageAs" = "3:1"
8330-
"Register" = "3:1"
8331-
"Exclude" = "11:FALSE"
8332-
"IsDependency" = "11:TRUE"
8333-
"IsolateTo" = "8:"
8334-
}
83358230
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4FBF49FC0C81EBB2568861BC1E029FD1"
83368231
{
83378232
"AssemblyRegister" = "3:1"
@@ -9530,6 +9425,32 @@
95309425
"IsDependency" = "11:FALSE"
95319426
"IsolateTo" = "8:"
95329427
}
9428+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7643B2E01E55816C8BA2265FF9E9B786"
9429+
{
9430+
"AssemblyRegister" = "3:1"
9431+
"AssemblyIsInGAC" = "11:FALSE"
9432+
"AssemblyAsmDisplayName" = "8:AGauge, Version=2.1.8690.23867, Culture=neutral, processorArchitecture=MSIL"
9433+
"ScatterAssemblies"
9434+
{
9435+
}
9436+
"SourcePath" = "8:AGauge.dll"
9437+
"TargetName" = "8:"
9438+
"Tag" = "8:"
9439+
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
9440+
"Condition" = "8:"
9441+
"Transitive" = "11:FALSE"
9442+
"Vital" = "11:TRUE"
9443+
"ReadOnly" = "11:FALSE"
9444+
"Hidden" = "11:FALSE"
9445+
"System" = "11:FALSE"
9446+
"Permanent" = "11:FALSE"
9447+
"SharedLegacy" = "11:FALSE"
9448+
"PackageAs" = "3:1"
9449+
"Register" = "3:1"
9450+
"Exclude" = "11:TRUE"
9451+
"IsDependency" = "11:TRUE"
9452+
"IsolateTo" = "8:"
9453+
}
95339454
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_76C124487B58F9503C60B5679A43F43E"
95349455
{
95359456
"AssemblyRegister" = "3:1"
@@ -11078,6 +10999,32 @@
1107810999
"IsDependency" = "11:TRUE"
1107911000
"IsolateTo" = "8:"
1108011001
}
11002+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B8073AE507D3E3454F05FE38F157CEDD"
11003+
{
11004+
"AssemblyRegister" = "3:1"
11005+
"AssemblyIsInGAC" = "11:FALSE"
11006+
"AssemblyAsmDisplayName" = "8:WinNUT-Client_Common, Version=2.2.8690.23867, Culture=neutral, processorArchitecture=MSIL"
11007+
"ScatterAssemblies"
11008+
{
11009+
}
11010+
"SourcePath" = "8:WinNUT-Client_Common.dll"
11011+
"TargetName" = "8:"
11012+
"Tag" = "8:"
11013+
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
11014+
"Condition" = "8:"
11015+
"Transitive" = "11:FALSE"
11016+
"Vital" = "11:TRUE"
11017+
"ReadOnly" = "11:FALSE"
11018+
"Hidden" = "11:FALSE"
11019+
"System" = "11:FALSE"
11020+
"Permanent" = "11:FALSE"
11021+
"SharedLegacy" = "11:FALSE"
11022+
"PackageAs" = "3:1"
11023+
"Register" = "3:1"
11024+
"Exclude" = "11:FALSE"
11025+
"IsDependency" = "11:TRUE"
11026+
"IsolateTo" = "8:"
11027+
}
1108111028
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B8623759245285260351785642DF324A"
1108211029
{
1108311030
"AssemblyRegister" = "3:1"
@@ -12921,15 +12868,15 @@
1292112868
{
1292212869
"Name" = "8:Microsoft Visual Studio"
1292312870
"ProductName" = "8:WinNUT"
12924-
"ProductCode" = "8:{023BDDA5-359C-4698-A4DB-5B104D4C9340}"
12925-
"PackageCode" = "8:{0EA7AC02-24AA-4A40-97F3-DBC77D170BE8}"
12871+
"ProductCode" = "8:{59FA2D2B-9A33-4889-897C-EDA8E87DE6A0}"
12872+
"PackageCode" = "8:{725679C7-4AF5-4AB4-9AF4-CBB753A11D56}"
1292612873
"UpgradeCode" = "8:{7EA17151-76E7-4E29-8F6A-621C1B4144C2}"
1292712874
"AspNetVersion" = "8:2.0.50727.0"
1292812875
"RestartWWWService" = "11:FALSE"
1292912876
"RemovePreviousVersions" = "11:TRUE"
1293012877
"DetectNewerInstalledVersion" = "11:TRUE"
1293112878
"InstallAllUsers" = "11:FALSE"
12932-
"ProductVersion" = "8:2.2.8688"
12879+
"ProductVersion" = "8:2.2.8690"
1293312880
"Manufacturer" = "8:NUTDotNet"
1293412881
"ARPHELPTELEPHONE" = "8:"
1293512882
"ARPHELPLINK" = "8:https://github.com/nutdotnet/WinNUT-Client/issues"
@@ -13481,7 +13428,7 @@
1348113428
{
1348213429
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_314CE5030A4040E69371869B1C94AA16"
1348313430
{
13484-
"SourcePath" = "8:..\\AGauge_mod\\obj\\Debug\\AGauge.dll"
13431+
"SourcePath" = "8:..\\AGauge_mod\\obj\\Release\\AGauge.dll"
1348513432
"TargetName" = "8:"
1348613433
"Tag" = "8:"
1348713434
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"

‎WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,11 @@
114114
<Reference Include="System.Data" />
115115
<Reference Include="System.Deployment" />
116116
<Reference Include="System.Drawing" />
117-
<Reference Include="System.Runtime" />
118117
<Reference Include="System.Windows.Forms" />
119118
<Reference Include="System.Xml" />
120119
<Reference Include="System.Core" />
121120
<Reference Include="System.Xml.Linq" />
122121
<Reference Include="System.Data.DataSetExtensions" />
123-
<Reference Include="System.Net.Http" />
124122
</ItemGroup>
125123
<ItemGroup>
126124
<Import Include="Microsoft.VisualBasic" />

‎WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@
4444
<PropertyGroup>
4545
<OptionInfer>On</OptionInfer>
4646
</PropertyGroup>
47+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'PreRelease|AnyCPU' ">
48+
<DebugSymbols>true</DebugSymbols>
49+
<DefineDebug>false</DefineDebug>
50+
<DefineTrace>true</DefineTrace>
51+
<OutputPath>bin\test\</OutputPath>
52+
<DocumentationFile>WinNUT-Client_Common.xml</DocumentationFile>
53+
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
54+
<DebugType>full</DebugType>
55+
<PlatformTarget>AnyCPU</PlatformTarget>
56+
</PropertyGroup>
4757
<ItemGroup>
4858
<Reference Include="System" />
4959
<Reference Include="System.Data" />
@@ -55,7 +65,6 @@
5565
<Reference Include="System.Core" />
5666
<Reference Include="System.Xml.Linq" />
5767
<Reference Include="System.Data.DataSetExtensions" />
58-
<Reference Include="System.Net.Http" />
5968
</ItemGroup>
6069
<ItemGroup>
6170
<Import Include="Microsoft.VisualBasic" />

0 commit comments

Comments
 (0)