Skip to content

Commit b219537

Browse files
atauenisatauenis
committed
remove "-pre" suffix; fix build under Visual Studio
1 parent a30aeae commit b219537

File tree

2 files changed

+175
-175
lines changed

2 files changed

+175
-175
lines changed

‎Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static void Main(string[] args)
4545
Assembly.GetExecutingAssembly().GetName().Version.Major + "." +
4646
Assembly.GetExecutingAssembly().GetName().Version.Minor + "." +
4747
Assembly.GetExecutingAssembly().GetName().Version.Build
48-
+ "-pre"
48+
//+ "-pre"
4949
);
5050
Variables.Add("WOSystem", Environment.OSVersion.ToString());
5151

‎WebOne.csproj‎

Lines changed: 174 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<AssemblyName>webone</AssemblyName>
5-
<OutputType>Exe</OutputType>
6-
<TargetFramework>net6.0</TargetFramework>
7-
<Authors>Alexander Tauenis</Authors>
8-
<Version>0.15.0</Version>
9-
<VersionSuffix>-pre</VersionSuffix> <!--<VersionSuffix>-pre</VersionSuffix>-->
10-
<PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
11-
<Company>World</Company>
12-
<Product>WebOne HTTP Proxy Server</Product>
13-
<Description>HTTP 1.x proxy that makes old web browsers usable again in the Web 2.0 world.</Description>
14-
<RepositoryType>GitHub</RepositoryType>
15-
<RepositoryUrl>https://github.com/atauenis/webone/</RepositoryUrl>
16-
<StartupObject>WebOne.Program</StartupObject>
17-
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
18-
<Configurations>Debug;Release;ReleaseSC</Configurations>
19-
<RuntimeIdentifiers>win-x86;win-x64;win-arm;linux-x64;linux-arm;linux-arm64;osx-x64</RuntimeIdentifiers>
20-
<NoWarn>$(NoWarn);NETSDK1179;NETSDK1182</NoWarn>
21-
<!-- https://github.com/dotnet/sdk/issues/24269, https://stackoverflow.com/questions/69773547/visual-studio-2019-not-showing-net-6-framework/ -->
22-
</PropertyGroup>
23-
24-
<PropertyGroup Condition="$(RuntimeIdentifier.Contains('linux'))">
25-
<PackageArchitecture Condition="$(RuntimeIdentifier)=='linux-x64'">amd64</PackageArchitecture>
26-
<PackageArchitecture Condition="$(RuntimeIdentifier)=='linux-arm'">armhf</PackageArchitecture>
27-
<PackageArchitecture Condition="$(RuntimeIdentifier)=='linux-arm64'">arm64</PackageArchitecture>
28-
<PackageName>webone.$(PackageVersion).linux-$(PackageArchitecture)</PackageName>
29-
</PropertyGroup>
30-
31-
<PropertyGroup Condition="$(RuntimeIdentifier.Contains('win')) OR $(RuntimeIdentifier.Contains('osx'))">
32-
<PackageName>WebOne.$(PackageVersion).$(RuntimeIdentifier)</PackageName>
33-
</PropertyGroup>
34-
35-
<PropertyGroup Condition="$(Configuration)!='Debug'">
36-
<CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
37-
<DebugType>None</DebugType>
38-
<DebugSymbols>false</DebugSymbols>
39-
</PropertyGroup>
40-
41-
<PropertyGroup Condition="$(Configuration)=='Release' AND !$(RuntimeIdentifier.Contains('linux-arm'))">
42-
<SelfContained>False</SelfContained>
43-
</PropertyGroup>
44-
45-
<PropertyGroup Condition="$(Configuration)=='ReleaseSC' OR ($(Configuration)=='Release' AND $(RuntimeIdentifier.Contains('linux-arm')))">
46-
<SelfContained>True</SelfContained>
47-
</PropertyGroup>
48-
49-
<PropertyGroup Condition="$(RuntimeIdentifier.Contains('win')) AND $(SelfContained)==true">
3+
<PropertyGroup>
4+
<AssemblyName>webone</AssemblyName>
5+
<OutputType>Exe</OutputType>
6+
<TargetFramework>net6.0</TargetFramework>
7+
<Authors>Alexander Tauenis</Authors>
8+
<Version>0.15.0</Version>
9+
<VersionSuffix></VersionSuffix> <!--<VersionSuffix>-pre</VersionSuffix>-->
10+
<PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
11+
<Company>World</Company>
12+
<Product>WebOne HTTP Proxy Server</Product>
13+
<Description>HTTP 1.x proxy that makes old web browsers usable again in the Web 2.0 world.</Description>
14+
<RepositoryType>GitHub</RepositoryType>
15+
<RepositoryUrl>https://github.com/atauenis/webone/</RepositoryUrl>
16+
<StartupObject>WebOne.Program</StartupObject>
17+
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
18+
<Configurations>Debug;Release;ReleaseSC</Configurations>
19+
<RuntimeIdentifiers>win-x86;win-x64;win-arm;linux-x64;linux-arm;linux-arm64;osx-x64</RuntimeIdentifiers>
20+
<NoWarn>$(NoWarn);NETSDK1179;NETSDK1182</NoWarn>
21+
<!-- https://github.com/dotnet/sdk/issues/24269, https://stackoverflow.com/questions/69773547/visual-studio-2019-not-showing-net-6-framework/ -->
22+
</PropertyGroup>
23+
24+
<PropertyGroup Condition="$(RuntimeIdentifier.Contains('linux'))">
25+
<PackageArchitecture Condition="$(RuntimeIdentifier)=='linux-x64'">amd64</PackageArchitecture>
26+
<PackageArchitecture Condition="$(RuntimeIdentifier)=='linux-arm'">armhf</PackageArchitecture>
27+
<PackageArchitecture Condition="$(RuntimeIdentifier)=='linux-arm64'">arm64</PackageArchitecture>
28+
<PackageName>webone.$(PackageVersion).linux-$(PackageArchitecture)</PackageName>
29+
</PropertyGroup>
30+
31+
<PropertyGroup Condition="$(RuntimeIdentifier.Contains('win')) OR $(RuntimeIdentifier.Contains('osx'))">
32+
<PackageName>WebOne.$(PackageVersion).$(RuntimeIdentifier)</PackageName>
33+
</PropertyGroup>
34+
35+
<PropertyGroup Condition="$(Configuration)!='Debug'">
36+
<CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
37+
<DebugType>None</DebugType>
38+
<DebugSymbols>false</DebugSymbols>
39+
</PropertyGroup>
40+
41+
<PropertyGroup Condition="$(Configuration)=='Release' AND !$(RuntimeIdentifier.Contains('linux-arm'))">
42+
<SelfContained>False</SelfContained>
43+
</PropertyGroup>
44+
45+
<PropertyGroup Condition="$(Configuration)=='ReleaseSC' OR ($(Configuration)=='Release' AND $(RuntimeIdentifier.Contains('linux-arm')))">
46+
<SelfContained>True</SelfContained>
47+
</PropertyGroup>
48+
49+
<PropertyGroup Condition="$(RuntimeIdentifier.Contains('win')) AND $(SelfContained)==true">
5050
<PackageName>WebOne.$(PackageVersion).$(RuntimeIdentifier).full.self-contained</PackageName>
5151
</PropertyGroup>
5252

53-
<ItemGroup Condition="$(SelfContained)==false">
54-
<DebDotNetDependencies Include="dotnet-runtime-6.0" />
55-
<RpmDotNetDependencies Include="dotnet-runtime-6.0" />
56-
</ItemGroup>
53+
<ItemGroup Condition="$(SelfContained)==false">
54+
<DebDotNetDependencies Include="dotnet-runtime-6.0" />
55+
<RpmDotNetDependencies Include="dotnet-runtime-6.0" />
56+
</ItemGroup>
5757

58-
<ItemGroup>
59-
<DebDependency Include="imagemagick-6.q16" />
60-
<DebRecommends Include="ffmpeg" />
61-
<DebRecommends Include="youtube-dl" />
62-
</ItemGroup>
58+
<ItemGroup>
59+
<DebDependency Include="imagemagick-6.q16" />
60+
<DebRecommends Include="ffmpeg" />
61+
<DebRecommends Include="youtube-dl" />
62+
</ItemGroup>
6363

64-
<ItemGroup>
65-
<RpmDependency Include="ImageMagick" />
66-
</ItemGroup>
64+
<ItemGroup>
65+
<RpmDependency Include="ImageMagick" />
66+
</ItemGroup>
6767

68-
<ItemGroup>
69-
<RuntimeHostConfigurationOption Include="System.Net.SocketsHttpHandler.Http3Support" Value="true" />
70-
</ItemGroup>
68+
<ItemGroup>
69+
<RuntimeHostConfigurationOption Include="System.Net.SocketsHttpHandler.Http3Support" Value="true" />
70+
</ItemGroup>
7171

7272
<ItemGroup Condition="$(SelfContained)==true">
7373
<!--
@@ -78,9 +78,9 @@
7878
<DebDotNetDependencies Include="libc6, libgcc1, libgssapi-krb5-2, libstdc++6, zlib1g, libssl3 | libssl1.1 | libssl1.0.2 | libssl1.0.1 | libssl1.0.0 | libssl0.9.8, libicu70 | libicu69 | libicu68 | libicu67 | libicu66 | libicu65 | libicu64 | libicu63 | libicu62 | libicu61 | libicu60 | libicu59 | libicu58 | libicu57 | libicu56 | libicu55 | libicu54 | libicu53 | libicu52" />
7979
</ItemGroup>
8080

81-
<PropertyGroup>
82-
<PostInstallScript>
83-
<![CDATA[
81+
<PropertyGroup>
82+
<PostInstallScript>
83+
<![CDATA[
8484
WOOldConfDir=/etc/WebOne/
8585
WOOldConfFile=/etc/WebOne/webone.conf
8686
WONewConfFile=/etc/webone.conf.d/migrated.conf
@@ -103,9 +103,9 @@ if [ -f /bin/systemctl ]; then
103103
systemctl enable --now webone
104104
fi
105105
]]>
106-
</PostInstallScript>
107-
<PreRemoveScript>
108-
<![CDATA[
106+
</PostInstallScript>
107+
<PreRemoveScript>
108+
<![CDATA[
109109
if [ -f /bin/systemctl ]; then
110110
systemctl stop webone
111111
systemctl disable webone
@@ -114,116 +114,116 @@ if [ -f /usr/bin/killall ]; then
114114
killall webone || true
115115
fi
116116
]]>
117-
</PreRemoveScript>
118-
<PostRemoveScript>
119-
<![CDATA[
117+
</PreRemoveScript>
118+
<PostRemoveScript>
119+
<![CDATA[
120120
if [ -f /bin/systemctl ]; then
121121
systemctl daemon-reload
122122
fi
123123
]]>
124-
</PostRemoveScript>
125-
</PropertyGroup>
126-
127-
<ItemGroup>
128-
<None Remove="docs/**" />
129-
<None Remove="EXE/**" />
130-
<None Remove="ImageMagic/**" />
131-
<None Remove="Netscape/**" />
132-
<None Remove="Screenshots/**" />
133-
<None Remove="viewtube/**" />
134-
<None Remove="WebFixes/**" />
135-
<None Remove="convert.txt" />
136-
<None Remove="*.rar" />
137-
<None Remove="*.lnk" />
138-
</ItemGroup>
139-
140-
<ItemGroup>
141-
<Folder Include="Properties\" />
142-
</ItemGroup>
143-
144-
<ItemGroup>
145-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" />
146-
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
147-
</ItemGroup>
148-
149-
<ItemGroup>
150-
<None Update="LICENSE.txt">
151-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
152-
</None>
153-
<None Update="README.md">
154-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
155-
</None>
156-
<None Update="CONTRIBUTING.md">
157-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
158-
</None>
159-
<None Update="logo.webp">
160-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
161-
</None>
162-
</ItemGroup>
163-
164-
<ItemGroup Condition="$(RuntimeIdentifier.Contains('linux'))">
165-
<Content Include="webone.service" CopyToPublishDirectory="Always" LinuxFileMode="1755">
166-
<LinuxPath>/etc/systemd/system/webone.service</LinuxPath>
167-
</Content>
168-
<Content Include="webone.logrotate" CopyToPublishDirectory="Always" LinuxFileMode="1755">
169-
<LinuxPath>/etc/logrotate.d/webone</LinuxPath>
170-
</Content>
171-
</ItemGroup>
172-
173-
<ItemGroup>
174-
<Content Include="webone.conf" CopyToPublishDirectory="Always" LinuxFileMode="644">
175-
<LinuxPath Condition="$(RuntimeIdentifier.Contains('linux'))">/etc/webone.conf</LinuxPath>
176-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
177-
</Content>
178-
179-
<Content Include="codepage.conf" CopyToPublishDirectory="Always" LinuxFileMode="644">
180-
<LinuxPath Condition="$(RuntimeIdentifier.Contains('linux'))">/etc/webone.conf.d/codepage.conf</LinuxPath>
181-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
182-
</Content>
183-
</ItemGroup>
184-
185-
<ItemGroup Condition="$(RuntimeIdentifier.Contains('win'))">
186-
<None Update="convert.exe">
187-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
188-
</None>
189-
<None Update="LICENSE-ImageMagick.txt">
190-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
191-
</None>
192-
</ItemGroup>
193-
194-
<ItemGroup Condition="$(RuntimeIdentifier.Contains('win')) AND $(SelfContained)==true">
195-
<None Include="Win32-full/*.*">
196-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
197-
<Link>%(Filename)%(Extension)</Link>
198-
</None>
199-
</ItemGroup>
200-
201-
<ItemGroup Condition="$(RuntimeIdentifier.Contains('win')) AND $(Configuration)=='Debug'">
202-
<None Include="convert.exe">
124+
</PostRemoveScript>
125+
</PropertyGroup>
126+
127+
<ItemGroup>
128+
<None Remove="docs/**" />
129+
<None Remove="EXE/**" />
130+
<None Remove="ImageMagic/**" />
131+
<None Remove="Netscape/**" />
132+
<None Remove="Screenshots/**" />
133+
<None Remove="viewtube/**" />
134+
<None Remove="WebFixes/**" />
135+
<None Remove="convert.txt" />
136+
<None Remove="*.rar" />
137+
<None Remove="*.lnk" />
138+
</ItemGroup>
139+
140+
<ItemGroup>
141+
<Folder Include="Properties\" />
142+
</ItemGroup>
143+
144+
<ItemGroup>
145+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" />
146+
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
147+
</ItemGroup>
148+
149+
<ItemGroup>
150+
<None Update="LICENSE.txt">
151+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
152+
</None>
153+
<None Update="README.md">
154+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
155+
</None>
156+
<None Update="CONTRIBUTING.md">
157+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
158+
</None>
159+
<None Update="logo.webp">
160+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
161+
</None>
162+
</ItemGroup>
163+
164+
<ItemGroup Condition="$(RuntimeIdentifier.Contains('linux'))">
165+
<Content Include="webone.service" CopyToPublishDirectory="Always" LinuxFileMode="1755">
166+
<LinuxPath>/etc/systemd/system/webone.service</LinuxPath>
167+
</Content>
168+
<Content Include="webone.logrotate" CopyToPublishDirectory="Always" LinuxFileMode="1755">
169+
<LinuxPath>/etc/logrotate.d/webone</LinuxPath>
170+
</Content>
171+
</ItemGroup>
172+
173+
<ItemGroup>
174+
<Content Include="webone.conf" CopyToPublishDirectory="Always" LinuxFileMode="644">
175+
<LinuxPath Condition="$(RuntimeIdentifier.Contains('linux'))">/etc/webone.conf</LinuxPath>
203176
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
204-
</None>
205-
<None Include="Win32-full/*.*">
206-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
207-
<Link>%(Filename)%(Extension)</Link>
208-
</None>
209-
</ItemGroup>
210-
211-
<ItemGroup Condition="$(RuntimeIdentifier.Contains('osx'))">
212-
<None Include="macOS-resforks/*.*">
213-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
214-
<Link>__MACOSX/%(Filename)%(Extension)</Link>
215-
</None>
216-
</ItemGroup>
217-
218-
<ItemGroup Condition="$(RuntimeIdentifier.Contains('linux'))">
219-
<Content Include="LinuxAndMacOS/yt.sh" CopyToPublishDirectory="Always" LinuxFileMode="1755">
177+
</Content>
178+
179+
<Content Include="codepage.conf" CopyToPublishDirectory="Always" LinuxFileMode="644">
180+
<LinuxPath Condition="$(RuntimeIdentifier.Contains('linux'))">/etc/webone.conf.d/codepage.conf</LinuxPath>
181+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
182+
</Content>
183+
</ItemGroup>
184+
185+
<ItemGroup Condition="$(RuntimeIdentifier.Contains('win'))">
186+
<None Update="convert.exe">
187+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
188+
</None>
189+
<None Update="LICENSE-ImageMagick.txt">
190+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
191+
</None>
192+
</ItemGroup>
193+
194+
<ItemGroup Condition="$(RuntimeIdentifier.Contains('win')) AND $(SelfContained)==true">
195+
<None Include="Win32-full/*.*">
196+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
197+
<Link>%(Filename)%(Extension)</Link>
198+
</None>
199+
</ItemGroup>
200+
201+
<ItemGroup Condition="$(Configuration)=='Debug'">
202+
<None Include="convert.exe">
203+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
204+
</None>
205+
<None Include="Win32-full/*.*">
206+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
207+
<Link>%(Filename)%(Extension)</Link>
208+
</None>
209+
</ItemGroup>
210+
211+
<ItemGroup Condition="$(RuntimeIdentifier.Contains('osx'))">
212+
<None Include="macOS-resforks/*.*">
213+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
214+
<Link>__MACOSX/%(Filename)%(Extension)</Link>
215+
</None>
216+
</ItemGroup>
217+
218+
<ItemGroup Condition="$(RuntimeIdentifier.Contains('linux'))">
219+
<Content Include="LinuxAndMacOS/yt.sh" CopyToPublishDirectory="Always" LinuxFileMode="1755">
220220
<LinuxPath>/usr/share/webone/yt.sh</LinuxPath>
221-
</Content>
222-
</ItemGroup>
223-
224-
<ItemGroup Condition="$(RuntimeIdentifier.Contains('osx'))">
225-
<Content Include="LinuxAndMacOS/yt.sh" CopyToPublishDirectory="Always">
226-
<Link>yt.sh</Link>
227-
</Content>
228-
</ItemGroup>
221+
</Content>
222+
</ItemGroup>
223+
224+
<ItemGroup Condition="$(RuntimeIdentifier.Contains('osx'))">
225+
<Content Include="LinuxAndMacOS/yt.sh" CopyToPublishDirectory="Always">
226+
<Link>yt.sh</Link>
227+
</Content>
228+
</ItemGroup>
229229
</Project>

0 commit comments

Comments
 (0)