0.47 rc3

tylike · Jun 22, 2016 · ff3aaf3 · ff3aaf3
1 parent c2511c5
commit ff3aaf3
Show file tree

Hide file tree

Showing 65 changed files with 321 additions and 349 deletions.
diff --git a/.gitignore b/.gitignore
@@ -184,3 +184,7 @@ FakesAssemblies/
 
 # App Data Folder
 App_Data/
+
+# Visual studio folders
+.vs/
+.nuget/
diff --git a/Excess.Compiler/Excess.Compiler.Razor/Excess.Compiler.Razor.csproj b/Excess.Compiler/Excess.Compiler.Razor/Excess.Compiler.Razor.csproj
@@ -32,69 +32,69 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CodeAnalysis, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.2.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.2.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.2.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.1.2.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.2.2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.2\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.VisualBasic.1.2.2\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.2\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.2.2\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.2.2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="RazorEngine, Version=3.8.2.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
-      <HintPath>..\packages\RazorEngine.3.8.2\lib\net45\RazorEngine.dll</HintPath>
+      <HintPath>..\..\packages\RazorEngine.3.8.2\lib\net45\RazorEngine.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Composition.AttributedModel, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Composition.Convention, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Composition.Hosting, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Composition.Runtime, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Composition.TypedParts, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <HintPath>..\..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
@@ -117,6 +117,10 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Excess.Compiler/Excess.Compiler.Razor/app.config b/Excess.Compiler/Excess.Compiler.Razor/app.config
@@ -3,37 +3,37 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.1.37.0" newVersion="1.1.37.0" />
+        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.37.0" newVersion="1.1.37.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces.Desktop" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces.Desktop" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
+</configuration>
diff --git a/Excess.Compiler/Excess.Compiler.Razor/packages.config b/Excess.Compiler/Excess.Compiler.Razor/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net46" />
+  <package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis" version="1.2.2" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.Common" version="1.2.2" targetFramework="net46" />
@@ -9,16 +9,16 @@
   <package id="Microsoft.CodeAnalysis.VisualBasic" version="1.2.2" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.2.2" targetFramework="net46" />
   <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.2.2" targetFramework="net46" />
-  <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
+  <package id="Microsoft.Composition" version="1.0.27" targetFramework="net46" />
   <package id="RazorEngine" version="3.8.2" targetFramework="net46" />
-  <package id="System.Collections" version="4.0.10" targetFramework="net46" />
+  <package id="System.Collections" version="4.0.0" targetFramework="net46" />
   <package id="System.Collections.Immutable" version="1.1.37" targetFramework="net46" />
-  <package id="System.Diagnostics.Debug" version="4.0.10" targetFramework="net46" />
-  <package id="System.Globalization" version="4.0.10" targetFramework="net46" />
+  <package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net46" />
+  <package id="System.Globalization" version="4.0.0" targetFramework="net46" />
   <package id="System.Linq" version="4.0.0" targetFramework="net46" />
   <package id="System.Reflection.Metadata" version="1.2.0" targetFramework="net46" />
   <package id="System.Resources.ResourceManager" version="4.0.0" targetFramework="net46" />
-  <package id="System.Runtime" version="4.0.20" targetFramework="net46" />
-  <package id="System.Runtime.Extensions" version="4.0.10" targetFramework="net46" />
-  <package id="System.Threading" version="4.0.10" targetFramework="net46" />
+  <package id="System.Runtime" version="4.0.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net46" />
+  <package id="System.Threading" version="4.0.0" targetFramework="net46" />
 </packages>
diff --git a/Excess.Compiler/Nuget/Excess.Compiler.Debug.nuspec b/Excess.Compiler/Nuget/Excess.Compiler.Debug.nuspec
@@ -2,15 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Excess.Compiler</id>
-        <version>0.46.73-alpha</version>
+        <version>0.47.1-alpha</version>
         <authors>Excess</authors>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Metaprogramming platform for C#</description>
 
         <dependencies>
           <dependency id="Microsoft.CodeAnalysis" version="1.2.2"/>
           <dependency id="RazorEngine" version="3.8.2"/>
-          <dependency id="Excess.Runtime" version="0.46.8-alpha"/>
+          <dependency id="Excess.Runtime" version="0.47.1-alpha"/>
         </dependencies>
     </metadata>
     <files>

diff --git a/Excess.Compiler/Nuget/Excess.Compiler.nuspec b/Excess.Compiler/Nuget/Excess.Compiler.nuspec
@@ -10,13 +10,14 @@
         <dependencies>
           <dependency id="Microsoft.CodeAnalysis" version="1.2.2"/>
           <dependency id="RazorEngine" version="3.8.2"/>
+          <dependency id="Excess.Runtime" version="0.47.0-alpha"/>
         </dependencies>
     </metadata>
     <files>
         <file src="..\bin\Release\Excess.Compiler.dll" target="lib\Net45\Excess.Compiler.dll" />
         <file src="..\xslang\bin\Release\xslang.dll" target="lib\Net45\xslang.dll" />
         <file src="..\Excess.Compiler.Mock\bin\Release\Excess.Compiler.Mock.dll" target="lib\Net45\Excess.Compiler.Mock.dll" />
-        <file src="..\..\Excess.Compiler.Razor\bin\Release\Excess.Compiler.Razor.dll" target="lib\Net45\Excess.Compiler.Razor.dll" />
+        <file src="..\Excess.Compiler.Razor\bin\Release\Excess.Compiler.Razor.dll" target="lib\Net45\Excess.Compiler.Razor.dll" />
       <file src="..\Excess.Compiler.GraphInstances\bin\Release\Excess.Compiler.GraphInstances.dll" target="lib\Net45\Excess.Compiler.GraphInstances.dll" />
     </files>
 </package>
diff --git a/Excess.Compiler/Nuget/Excess.Runtime.Debug.nuspec b/Excess.Compiler/Nuget/Excess.Runtime.Debug.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Excess.Runtime</id>
-        <version>0.46.8-alpha</version>
+        <version>0.47.1-alpha</version>
         <authors>Excess</authors>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Excess Runtime</description>

diff --git a/Excess.Compiler/Nuget/Excess.Runtime.nuspec b/Excess.Compiler/Nuget/Excess.Runtime.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Excess.Runtime</id>
-        <version>0.46.1-alpha</version>
+        <version>0.47.0-alpha</version>
         <authors>Excess</authors>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Excess Runtime</description>

diff --git a/Excess.Compiler/Nuget/publish.bat b/Excess.Compiler/Nuget/publish.bat
@@ -1,5 +1,10 @@
 
 ..\..\.nuget\nuget pack Excess.Compiler.nuspec
-..\..\.nuget\nuget push Excess.Compiler.0.46.5-alpha.nupkg
+..\..\.nuget\nuget push Excess.Compiler.0.47.0-alpha.nupkg
 
-del Excess.Compiler.0.46.5-alpha.nupkg
+del Excess.Compiler.0.47.0-alpha.nupkg
+
+..\..\.nuget\nuget pack Excess.Runtime.nuspec
+..\..\.nuget\nuget push Excess.Runtime.0.47.0-alpha.nupkg
+
+del Excess.Runtime.0.47.0-alpha.nupkg
diff --git a/Excess.Compiler/xsc/Runner.cs b/Excess.Compiler/xsc/Runner.cs
@@ -48,8 +48,7 @@ public IEnumerable<string> directoryFiles(string directory = null)
         public IDictionary<string, LoaderFunc> directoryExtensions(string directory)
         {
             var items = Directory.EnumerateFiles(directory, "*", SearchOption.AllDirectories)
-                .Where(file => Path.GetExtension(file) == ".dll"
-                            && Path.GetFileName(file).StartsWith("Excess.Extensions"))
+                .Where(file => Path.GetExtension(file) == ".dll")
                 .Select(dll => loadExtension(dll));
 
             var result = new Dictionary<string, LoaderFunc>();

diff --git a/Excess.Concurrent/Benchmarks/ChameneoRedux/ChameneoRedux.xs b/Excess.Concurrent/Benchmarks/ChameneoRedux/ChameneoRedux.xs
@@ -105,6 +105,7 @@ namespace ChameneoRedux
             PrintRun(firstRunColors, firstRun);
             Console.WriteLine();
             PrintRun(secondRunColors, secondRun);
+			return;
 		}
 
         IEnumerable<Chameneo> Run(int meetings, Color[] colors)

diff --git a/Excess.Concurrent/Benchmarks/ChameneoRedux/ChameneoRedux.xs.cs b/Excess.Concurrent/Benchmarks/ChameneoRedux/ChameneoRedux.xs.cs
@@ -16,7 +16,7 @@ public enum Color
         yellow,
     }
 
-    [Concurrent(id = "309e985c-480e-4676-b893-3f4eb749acc3")]
+    [Concurrent(id = "d769a165-7067-4039-8bbb-9d353d8d1dd2")]
     public class Chameneo : ConcurrentObject
     {
         public Color Colour
@@ -161,7 +161,7 @@ public void __op1(bool ? v1, bool ? v2, Exception __ex)
         public readonly Guid __ID = Guid.NewGuid();
     }
 
-    [Concurrent(id = "2cde6b45-07fd-474a-b579-8904ee45d3d6")]
+    [Concurrent(id = "45989cb2-7843-4bc2-b9d7-881bf2e68c52")]
     public class Broker : ConcurrentObject
     {
         int _meetings = 0;
@@ -328,8 +328,8 @@ public void __op2(bool ? v1, bool ? v2, Exception __ex)
         public readonly Guid __ID = Guid.NewGuid();
     }
 
-    [Concurrent(id = "7ccf93be-3439-45dd-a553-b51e6f5b18bc")]
-    [ConcurrentSingleton(id: "3bcc8c09-c043-4b52-a19b-83c9e4536908")]
+    [Concurrent(id = "8a7cd853-a7ee-4747-b586-116dcf0bca08")]
+    [ConcurrentSingleton(id: "c2d4597c-049e-4cdb-bb31-8a6ae9775985")]
     public class __app : ConcurrentObject
     {
         protected override void __started()
@@ -447,6 +447,7 @@ private IEnumerable<Expression> __concurrentmain(CancellationToken __cancellatio
             PrintRun(firstRunColors, firstRun);
             Console.WriteLine();
             PrintRun(secondRunColors, secondRun);
+            App.Stop();
             {
                 __dispatch("main");
                 if (__success != null)

diff --git a/Excess.Concurrent/Benchmarks/ChameneoRedux/Readme.md b/Excess.Concurrent/Benchmarks/ChameneoRedux/Readme.md
@@ -1,7 +1,7 @@
 to compile: 
 
-xsc DiningPhilosophers.xs -concurrent Console
+xsc ChameneoRedux.xs -concurrent Performance
 
 to run:
 
-DiningPhilosophers
+ChameneoRedux