Fixing build structure.

Fixing circle ci configuration.
espertechinc · Nov 5, 2020 · 195d5d9 · 195d5d9
1 parent 83995c8
commit 195d5d9
Show file tree

Hide file tree

Showing 22 changed files with 189 additions and 251 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,5 +9,9 @@ jobs:
 
     steps:
       - checkout
-      - run: dotnet restore NEsper.sln
-      - run: dotnet build NEsper.sln
+      - run: dotnet restore NEsperAll.sln
+      - run: msbuild NEsper.proj
+      - store_artifacts:
+        path: build/NEsper-8.5.0.zip
+      - store_artifacts:
+        path: build/packages
diff --git a/.vs/NEsperAll/DesignTimeBuild/.dtbcache.v2 b/.vs/NEsperAll/DesignTimeBuild/.dtbcache.v2
diff --git a/NEsper.proj b/NEsper.proj
diff --git a/NEsperAll.sln b/NEsperAll.sln
diff --git a/examples/NEsper.Benchmark/NEsper.Benchmark.Client/NEsper.Benchmark.Client.csproj b/examples/NEsper.Benchmark/NEsper.Benchmark.Client/NEsper.Benchmark.Client.csproj
@@ -21,9 +21,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj"/>
-        <ProjectReference Include="..\..\NEsper\NEsper.Common\NEsper.Common.csproj"/>
-        <ProjectReference Include="..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj"/>
+        <ProjectReference Include="..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj"/>
+        <ProjectReference Include="..\..\..\src\NEsper.Common\NEsper.Common.csproj"/>
+        <ProjectReference Include="..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj"/>
         <ProjectReference Include="..\NEsper.Benchmark.Common\NEsper.Benchmark.Common.csproj"/>
     </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Benchmark/NEsper.Benchmark.Common/NEsper.Benchmark.Common.csproj b/examples/NEsper.Benchmark/NEsper.Benchmark.Common/NEsper.Benchmark.Common.csproj
@@ -20,8 +20,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj"/>
-        <ProjectReference Include="..\..\NEsper\NEsper.Common\NEsper.Common.csproj"/>
-        <ProjectReference Include="..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj"/>
+        <ProjectReference Include="..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj"/>
+        <ProjectReference Include="..\..\..\src\NEsper.Common\NEsper.Common.csproj"/>
+        <ProjectReference Include="..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj"/>
     </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Benchmark/NEsper.Benchmark.Perforator/NEsper.Benchmark.Perforator.csproj b/examples/NEsper.Benchmark/NEsper.Benchmark.Perforator/NEsper.Benchmark.Perforator.csproj
@@ -26,9 +26,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\NEsper\NEsper.Compiler\NEsper.Compiler.csproj" />
-        <ProjectReference Include="..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-        <ProjectReference Include="..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-        <ProjectReference Include="..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+        <ProjectReference Include="..\..\..\src\NEsper.Compiler\NEsper.Compiler.csproj" />
+        <ProjectReference Include="..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+        <ProjectReference Include="..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+        <ProjectReference Include="..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Benchmark/NEsper.Benchmark.Server/NEsper.Benchmark.Server.csproj b/examples/NEsper.Benchmark/NEsper.Benchmark.Server/NEsper.Benchmark.Server.csproj
@@ -27,10 +27,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\NEsper\NEsper.Compiler\NEsper.Compiler.csproj" />
-    <ProjectReference Include="..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-    <ProjectReference Include="..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-    <ProjectReference Include="..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+    <ProjectReference Include="..\..\..\src\NEsper.Compiler\NEsper.Compiler.csproj" />
+    <ProjectReference Include="..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+    <ProjectReference Include="..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+    <ProjectReference Include="..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
     <ProjectReference Include="..\NEsper.Benchmark.Common\NEsper.Benchmark.Common.csproj" />
   </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Benchmark/NEsper.Benchmark.Stats/NEsper.Benchmark.Stats.csproj b/examples/NEsper.Benchmark/NEsper.Benchmark.Stats/NEsper.Benchmark.Stats.csproj
@@ -21,9 +21,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj"/>
-        <ProjectReference Include="..\..\NEsper\NEsper.Common\NEsper.Common.csproj"/>
-        <ProjectReference Include="..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj"/>
+        <ProjectReference Include="..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj"/>
+        <ProjectReference Include="..\..\..\src\NEsper.Common\NEsper.Common.csproj"/>
+        <ProjectReference Include="..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj"/>
         <ProjectReference Include="..\NEsper.Benchmark.Server\NEsper.Benchmark.Server.csproj"/>
     </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Examples/example/NEsper.Examples.MSMQ/NEsper.Examples.MSMQ.csproj b/examples/NEsper.Examples/example/NEsper.Examples.MSMQ/NEsper.Examples.MSMQ.csproj
@@ -20,9 +20,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
     <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
   </ItemGroup>
 

diff --git a/...Examples/example/NEsper.Examples.NamedWindowQuery/NEsper.Examples.NamedWindowQuery.csproj b/...Examples/example/NEsper.Examples.NamedWindowQuery/NEsper.Examples.NamedWindowQuery.csproj
@@ -20,10 +20,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Compat\NEsper.Compat.csproj" />
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Compat\NEsper.Compat.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
     <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
   </ItemGroup>
 </Project>
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
@@ -16,10 +16,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Compat\NEsper.Compat.csproj" />
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Compat\NEsper.Compat.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
     <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
   </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Examples/example/atm/NEsper.Examples.ATM.csproj b/examples/NEsper.Examples/example/atm/NEsper.Examples.ATM.csproj
@@ -24,9 +24,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
         <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Examples/example/autoid/NEsper.Examples.AutoId.csproj b/examples/NEsper.Examples/example/autoid/NEsper.Examples.AutoId.csproj
@@ -23,9 +23,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
         <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
         <ProjectReference Include="..\stockticker\NEsper.Examples.StockTicker.csproj" />
     </ItemGroup>

diff --git a/examples/NEsper.Examples/example/feedexample/NEsper.Examples.FeedExample.csproj b/examples/NEsper.Examples/example/feedexample/NEsper.Examples.FeedExample.csproj
@@ -26,9 +26,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
         <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Examples/example/marketdatafeed/NEsper.Examples.MarketDataFeed.csproj b/examples/NEsper.Examples/example/marketdatafeed/NEsper.Examples.MarketDataFeed.csproj
@@ -25,9 +25,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
         <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Examples/example/matchmaker/NEsper.Examples.MatchMaker.csproj b/examples/NEsper.Examples/example/matchmaker/NEsper.Examples.MatchMaker.csproj
@@ -25,9 +25,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-    <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+    <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
     <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
   </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Examples/example/qos_sla/NEsper.Examples.QoS_SLA.csproj b/examples/NEsper.Examples/example/qos_sla/NEsper.Examples.QoS_SLA.csproj
@@ -26,9 +26,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
         <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Examples/example/rsi/NEsper.Examples.RSI.csproj b/examples/NEsper.Examples/example/rsi/NEsper.Examples.RSI.csproj
@@ -26,9 +26,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
         <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
         <ProjectReference Include="..\stockticker\NEsper.Examples.StockTicker.csproj" />
     </ItemGroup>

diff --git a/examples/NEsper.Examples/example/stockticker/NEsper.Examples.StockTicker.csproj b/examples/NEsper.Examples/example/stockticker/NEsper.Examples.StockTicker.csproj
@@ -26,9 +26,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
         <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Examples/example/transaction/NEsper.Examples.Transaction.csproj b/examples/NEsper.Examples/example/transaction/NEsper.Examples.Transaction.csproj
@@ -26,9 +26,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-        <ProjectReference Include="..\..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+        <ProjectReference Include="..\..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
         <ProjectReference Include="..\..\support\NEsper.Examples.Support.csproj" />
     </ItemGroup>
 </Project>
diff --git a/examples/NEsper.Examples/support/NEsper.Examples.Support.csproj b/examples/NEsper.Examples/support/NEsper.Examples.Support.csproj
@@ -20,9 +20,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\NEsper\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
-        <ProjectReference Include="..\..\NEsper\NEsper.Common\NEsper.Common.csproj" />
-        <ProjectReference Include="..\..\NEsper\NEsper.Compiler\NEsper.Compiler.csproj" />
-        <ProjectReference Include="..\..\NEsper\NEsper.Runtime\NEsper.Runtime.csproj" />
+        <ProjectReference Include="..\..\..\src\NEsper.Log.NLog\NEsper.Log.NLog.csproj" />
+        <ProjectReference Include="..\..\..\src\NEsper.Common\NEsper.Common.csproj" />
+        <ProjectReference Include="..\..\..\src\NEsper.Compiler\NEsper.Compiler.csproj" />
+        <ProjectReference Include="..\..\..\src\NEsper.Runtime\NEsper.Runtime.csproj" />
     </ItemGroup>
 </Project>