Merge pull request #42 from espertechinc/assembly-load-context

Hotfix 8.5.5
espertechinc · Mar 9, 2023 · 578c69a · 578c69a
2 parents 95bc105 + 4284ced
commit 578c69a
Show file tree

Hide file tree

Showing 596 changed files with 15,528 additions and 18,289 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  win: circleci/windows@2.2.0
+  win: circleci/windows@5.0
 
 jobs:
   build:
@@ -12,6 +12,6 @@ jobs:
       - run: dotnet restore NEsperAll.sln
       - run: msbuild NEsper.proj
       - store_artifacts:
-          path: build/NEsper-8.5.4.zip
+          path: build/NEsper-8.5.5.zip
       - store_artifacts:
           path: build/packages
diff --git a/.idea/.idea.NEsper/.idea/contentModel.xml b/.idea/.idea.NEsper/.idea/contentModel.xml
diff --git a/.idea/.idea.NEsper/.idea/indexLayout.xml b/.idea/.idea.NEsper/.idea/indexLayout.xml
diff --git a/.idea/.idea.NEsper/.idea/modules.xml b/.idea/.idea.NEsper/.idea/modules.xml
diff --git a/.idea/.idea.NEsper/.idea/riderModule.iml b/.idea/.idea.NEsper/.idea/riderModule.iml
diff --git a/.idea/.idea.NEsper/riderModule.iml b/.idea/.idea.NEsper/riderModule.iml
diff --git a/.idea/.idea.NEsperAll/.idea/riderModule.iml b/.idea/.idea.NEsperAll/.idea/riderModule.iml
diff --git a/.idea/.idea.NEsperAll/riderModule.iml b/.idea/.idea.NEsperAll/riderModule.iml
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<Language>en-US</Language>
+		<LangVersion>8.0</LangVersion>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<PackageTags>NEsper Esper ESP CEP</PackageTags>
 		<PackageCopyright>Copyright (C) 2014-2019 Espertech. All rights reserved.</PackageCopyright>
@@ -17,7 +18,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<VersionPrefix Condition="'$(VersionPrefix)' == ''">8.5.4</VersionPrefix>
+		<VersionPrefix Condition="'$(VersionPrefix)' == ''">8.5.5</VersionPrefix>
 		<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 	</PropertyGroup>
 
@@ -40,23 +41,18 @@
 		<DefineConstants>$(DefineConstants);NETFRAMEWORK;NET472;</DefineConstants>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
-		<NetCore>true</NetCore>
-		<DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0;</DefineConstants>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+	<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
 		<NetCore>true</NetCore>
-		<DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0;</DefineConstants>
+		<DefineConstants>$(DefineConstants);NETCORE;</DefineConstants>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
+	<PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
 		<NetCore>true</NetCore>
-		<DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0;</DefineConstants>
+		<DefineConstants>$(DefineConstants);NETCORE;NET5;NET6;</DefineConstants>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)'=='net5.0'">
 		<NetCore>true</NetCore>
-		<DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD;NETSTANDARD2_0;</DefineConstants>
+		<DefineConstants>$(DefineConstants);NETCORE;NET5;</DefineConstants>
 	</PropertyGroup>
 </Project>
diff --git a/NEsper.Documentation/NEsper.Documentation.shfbproj b/NEsper.Documentation/NEsper.Documentation.shfbproj
@@ -16,7 +16,7 @@
     <Name>NEsper.Documentation</Name>
     <!-- SHFB properties -->
     <FrameworkVersion>.NET Framework 4.6.2</FrameworkVersion>
-    <OutputPath>..\build\NEsper-8.5.4\docs\</OutputPath>
+    <OutputPath>..\build\NEsper-8.5.5\docs\</OutputPath>
     <HtmlHelpName>NEsper</HtmlHelpName>
     <Language>en-US</Language>
     <TransformComponentArguments>

diff --git a/NEsper.nuspec b/NEsper.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>NEsper</id>
-    <version>8.5.4</version>
+    <version>8.5.5</version>
     <authors>EsperTech</authors>
     <owners>EsperTech</owners>
     <language>en-us</language>
@@ -27,7 +27,7 @@
   </metadata>
 
   <files>
-    <file src="build\NEsper-8.5.4\lib\**" target="lib\{framework name}[{version}]" />
+    <file src="build\NEsper-8.5.5\lib\**" target="lib\{framework name}[{version}]" />
   </files>
 </package>
 
diff --git a/NEsper.proj b/NEsper.proj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">Any CPU</Platform>
-    <Framework Condition=" '$(Framework)' == '' ">net472</Framework>
+    <Framework Condition=" '$(Framework)' == '' ">net6.0</Framework>
 
     <SolutionDir>$(MSBuildProjectDirectory)</SolutionDir>
     <!-- Distribution version -->
     <Version Condition=" '$(CCNetLabel)' != '' ">$(CCNetLabel)</Version>
-    <Version Condition=" '$(Version)' == '' ">8.5.4</Version>
+    <Version Condition=" '$(Version)' == '' ">8.5.5</Version>
 
     <!-- Build Directories -->
     <BuildPath>$(MSBuildProjectDirectory)\build</BuildPath>
@@ -175,7 +175,7 @@
   </Target>
 
   <Target Name="Copy-Binaries-All">
-    <MSBuild Projects="NEsper.proj" Properties="Configuration=$(Configuration);Platform=$(Platform);Framework=net472" Targets="Copy-Binaries-Main"/>
+    <MSBuild Projects="NEsper.proj" Properties="Configuration=$(Configuration);Platform=$(Platform);Framework=net6.0" Targets="Copy-Binaries-Main"/>
     <MSBuild Projects="NEsper.proj" Properties="Configuration=$(Configuration);Platform=$(Platform);Framework=netcoreapp3.1" Targets="Copy-Binaries-Main"/>
   </Target>
 

diff --git a/NEsper/NEsper.Codegen.Roslyn/NEsper.Codegen.Roslyn.csproj b/NEsper/NEsper.Codegen.Roslyn/NEsper.Codegen.Roslyn.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/NEsper/NEsper.LINQ/NEsper.LINQ.csproj b/NEsper/NEsper.LINQ/NEsper.LINQ.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/NEsperAll.sln b/NEsperAll.sln
@@ -80,8 +80,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEsper.Examples.VirtualDW",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEsper.Examples.MatchMaker", "examples\NEsper.Examples\example\matchmaker\NEsper.Examples.MatchMaker.csproj", "{0B9B80B6-6084-43C9-A75D-C02EC07070F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEsper.Examples.MSMQ", "examples\NEsper.Examples\example\NEsper.Examples.MSMQ\NEsper.Examples.MSMQ.csproj", "{6C00D901-6F48-418C-99D9-372613893315}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEsper.Avro", "src\NEsper.Avro\NEsper.Avro.csproj", "{10A408F5-05F0-4808-94EF-799FADA6750E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NEsper.Avro.Tests", "tst\NEsper.Avro.Tests\NEsper.Avro.Tests.csproj", "{A785D18E-6EB6-4725-B40A-0057CD592292}"
@@ -508,18 +506,6 @@ Global
 		{0B9B80B6-6084-43C9-A75D-C02EC07070F3}.Release|x64.Build.0 = Release|Any CPU
 		{0B9B80B6-6084-43C9-A75D-C02EC07070F3}.Release|x86.ActiveCfg = Release|Any CPU
 		{0B9B80B6-6084-43C9-A75D-C02EC07070F3}.Release|x86.Build.0 = Release|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Debug|x64.Build.0 = Debug|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Debug|x86.Build.0 = Debug|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Release|x64.ActiveCfg = Release|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Release|x64.Build.0 = Release|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Release|x86.ActiveCfg = Release|Any CPU
-		{6C00D901-6F48-418C-99D9-372613893315}.Release|x86.Build.0 = Release|Any CPU
 		{10A408F5-05F0-4808-94EF-799FADA6750E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10A408F5-05F0-4808-94EF-799FADA6750E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10A408F5-05F0-4808-94EF-799FADA6750E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -644,7 +630,6 @@ Global
 		{48B84BC5-1F78-47FA-A492-CF81C3658E8B} = {3426C460-A7A9-4AFB-9D42-04733A2F7C06}
 		{FD068D7A-DD6F-47FE-93A7-A86130E25C3C} = {3426C460-A7A9-4AFB-9D42-04733A2F7C06}
 		{0B9B80B6-6084-43C9-A75D-C02EC07070F3} = {3426C460-A7A9-4AFB-9D42-04733A2F7C06}
-		{6C00D901-6F48-418C-99D9-372613893315} = {3426C460-A7A9-4AFB-9D42-04733A2F7C06}
 		{10A408F5-05F0-4808-94EF-799FADA6750E} = {3B7A1B30-8D5A-496B-A734-9B80EB3C5794}
 		{A785D18E-6EB6-4725-B40A-0057CD592292} = {64E875A7-9654-43CF-87C3-FB3169CB7E20}
 		{0A298474-987A-4A93-B6E5-4CDEC1AF4D37} = {64E875A7-9654-43CF-87C3-FB3169CB7E20}

diff --git a/buildspec.yml b/buildspec.yml
@@ -4,7 +4,7 @@ env:
   variables:
     MASTER_PROJECT: .\NEsper.proj
     PACKAGE_DIRECTORY: .\packages
-    VERSION: 8.5.4
+    VERSION: 8.5.5
 
 phases:
   build:

diff --git a/docs/docfx.json b/docs/docfx.json
@@ -21,7 +21,7 @@
         }
       ],
       "properties": {
-        "TargetFramework": "netcoreapp3.1"
+        "TargetFramework": "net6.0"
       },
       "filter": "filter.yml",
       "dest": "api",

diff --git a/examples/NEsper.Benchmark/NEsper.Benchmark.Client/NEsper.Benchmark.Client.csproj b/examples/NEsper.Benchmark/NEsper.Benchmark.Client/NEsper.Benchmark.Client.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/examples/NEsper.Benchmark/NEsper.Benchmark.Common/NEsper.Benchmark.Common.csproj b/examples/NEsper.Benchmark/NEsper.Benchmark.Common/NEsper.Benchmark.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/examples/NEsper.Benchmark/NEsper.Benchmark.Perforator/NEsper.Benchmark.Perforator.csproj b/examples/NEsper.Benchmark/NEsper.Benchmark.Perforator/NEsper.Benchmark.Perforator.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/examples/NEsper.Benchmark/NEsper.Benchmark.Server/NEsper.Benchmark.Server.csproj b/examples/NEsper.Benchmark/NEsper.Benchmark.Server/NEsper.Benchmark.Server.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/examples/NEsper.Benchmark/NEsper.Benchmark.Stats/NEsper.Benchmark.Stats.csproj b/examples/NEsper.Benchmark/NEsper.Benchmark.Stats/NEsper.Benchmark.Stats.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/...Examples/example/NEsper.Examples.NamedWindowQuery/NEsper.Examples.NamedWindowQuery.csproj b/...Examples/example/NEsper.Examples.NamedWindowQuery/NEsper.Examples.NamedWindowQuery.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/examples/NEsper.Examples/example/NEsper.Examples.OHLC/NEsper.Examples.OHLC.csproj b/examples/NEsper.Examples/example/NEsper.Examples.OHLC/NEsper.Examples.OHLC.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/examples/NEsper.Examples/example/NEsper.Examples.VirtualDW/NEsper.Examples.VirtualDW.csproj b/examples/NEsper.Examples/example/NEsper.Examples.VirtualDW/NEsper.Examples.VirtualDW.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/examples/NEsper.Examples/example/atm/NEsper.Examples.ATM.csproj b/examples/NEsper.Examples/example/atm/NEsper.Examples.ATM.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/examples/NEsper.Examples/example/autoid/NEsper.Examples.AutoId.csproj b/examples/NEsper.Examples/example/autoid/NEsper.Examples.AutoId.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/examples/NEsper.Examples/example/feedexample/NEsper.Examples.FeedExample.csproj b/examples/NEsper.Examples/example/feedexample/NEsper.Examples.FeedExample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/examples/NEsper.Examples/example/marketdatafeed/NEsper.Examples.MarketDataFeed.csproj b/examples/NEsper.Examples/example/marketdatafeed/NEsper.Examples.MarketDataFeed.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup>