-
Notifications
You must be signed in to change notification settings - Fork 18
Expand file tree
/
Copy pathdiff.txt
More file actions
147 lines (137 loc) · 7.11 KB
/
Copy pathdiff.txt
File metadata and controls
147 lines (137 loc) · 7.11 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
diff --git a/MIG.Tests/MIG.Tests.csproj b/MIG.Tests/MIG.Tests.csproj
index 318597c..fcfeac5 100644
--- a/MIG.Tests/MIG.Tests.csproj
+++ b/MIG.Tests/MIG.Tests.csproj
@@ -4,19 +4,13 @@
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
-
- <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+ <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
- <PackageReference Include="coverlet.collector" Version="6.0.4">
- <PrivateAssets>all</PrivateAssets>
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
- </PackageReference>
</ItemGroup>
</Project>
diff --git a/MIG/Gateways/WebSocketGateway.cs b/MIG/Gateways/WebSocketGateway.cs
index 5b09a0a..74e97fd 100644
--- a/MIG/Gateways/WebSocketGateway.cs
+++ b/MIG/Gateways/WebSocketGateway.cs
@@ -184,7 +184,7 @@ namespace MIG.Gateways
isJsonPayload = true;
}
}
- catch (Exception e)
+ catch
{
// Not valid JSON, process as text message
}
diff --git a/MIG/MIG.csproj b/MIG/MIG.csproj
index 770f4be..1850163 100644
--- a/MIG/MIG.csproj
+++ b/MIG/MIG.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageId>MIG</PackageId>
- <Version>1.3.0</Version>
+ <Version>1.3.1</Version>
<Authors>Generoso Martello</Authors>
<Company>G-Labs</Company>
<Description>MIG is a .NET library providing an integrated solution for developing multi-protocol networked applications and real time web applications.</Description>
@@ -9,7 +9,7 @@
<PackageProjectUrl>https://github.com/genielabs/mig-service-dotnet/</PackageProjectUrl>
<PackageTags>web gateway middleware multi-protocol networking interoperability</PackageTags>
<OutputType>Library</OutputType>
- <TargetFrameworks>netstandard2.0;net472;net6.0;net8.0;net9.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;net472;net8.0;net10.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
@@ -18,15 +18,17 @@
</None>
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
- <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9"/>
- <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.9"/>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9"/>
- <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9"/>
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9"/>
- <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9"/>
+ <!-- Target .NET 10 -->
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
+ <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12"/>
+ <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.12"/>
+ <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.12"/>
+ <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.12"/>
+ <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.12"/>
+ <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.12"/>
</ItemGroup>
+ <!-- Target .NET 8 (LTS) -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1"/>
@@ -36,15 +38,7 @@
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0"/>
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
- <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.2"/>
- <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.1"/>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.1"/>
- <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.1"/>
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.1"/>
- <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.1"/>
- </ItemGroup>
-
+ <!-- Target Legacy (.NET Standard 2.0 / .NET Framework 4.7.2) -->
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net472' ">
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0"/>
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0"/>
@@ -56,12 +50,13 @@
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1"/>
</ItemGroup>
+ <!-- Common -->
<ItemGroup>
- <PackageReference Include="GLabs.Logging" Version="1.0.1" />
+ <PackageReference Include="GLabs.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
<PackageReference Include="WebsocketSharp.Standard2" Version="2022.4.16.1520"/>
- <PackageReference Include="MessagePack" Version="3.1.4"/>
- <PackageReference Include="MessagePack.Annotations" Version="3.1.4"/>
+ <PackageReference Include="MessagePack" Version="3.1.8"/>
+ <PackageReference Include="MessagePack.Annotations" Version="3.1.8"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.4"/>
<PackageReference Include="Ude.NetStandard" Version="1.2.0"/>
</ItemGroup>
diff --git a/Test.WebService/Program.cs b/Test.WebService/Program.cs
index 606c088..e0a5da6 100644
--- a/Test.WebService/Program.cs
+++ b/Test.WebService/Program.cs
@@ -94,6 +94,10 @@ namespace Test.WebService
return null;
};
}
+ web.SetOption(WebServiceGatewayOptions.HttpCacheIgnorePrefix + "1", @"\.mp4$");
+ web.SetOption(WebServiceGatewayOptions.HttpCacheIgnorePrefix + "2", @"\.webm$");
+ web.SetOption(WebServiceGatewayOptions.HttpCacheIgnorePrefix + "3", @"\.m3u8$");
+ web.SetOption(WebServiceGatewayOptions.HttpCacheIgnorePrefix + "4", @"\.ts$");
web.SetOption(WebServiceGatewayOptions.EnableFileCaching, "False");
// Add and configure the WebSocket gateway
diff --git a/Test.WebService/Test.WebService.csproj b/Test.WebService/Test.WebService.csproj
index ecb816c..c9e32d0 100644
--- a/Test.WebService/Test.WebService.csproj
+++ b/Test.WebService/Test.WebService.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>