Skip to content

Commit b429ee3

Browse files
author
Eric Swann
committed
Assembly version bump...related to nondisposal of cancellation token
1 parent 11aac6b commit b429ee3

4 files changed

Lines changed: 23 additions & 20 deletions

File tree

src/ClearScript.Manager.Http/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.3.0.*")]
36-
[assembly: AssemblyFileVersion("1.3.0.*")]
35+
[assembly: AssemblyVersion("1.3.1.*")]
36+
[assembly: AssemblyFileVersion("1.3.1.*")]

src/ClearScript.Manager.WebDemo/ClearScript.Manager.WebDemo.csproj

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@
4242
<Reference Include="ClearScript">
4343
<HintPath>..\packages\ClearScript.Installer.1.0.1.31662\lib\net45\ClearScript.dll</HintPath>
4444
</Reference>
45-
<Reference Include="ClearScript.Manager">
46-
<HintPath>..\packages\ClearScript.Manager.1.3.0.33162\lib\net45\ClearScript.Manager.dll</HintPath>
47-
</Reference>
48-
<Reference Include="ClearScript.Manager.Http">
49-
<HintPath>..\packages\ClearScript.Manager.Http.1.3.0.36391\lib\net45\ClearScript.Manager.Http.dll</HintPath>
50-
</Reference>
5145
<Reference Include="Microsoft.CSharp" />
5246
<Reference Include="System" />
5347
<Reference Include="System.Data" />
@@ -239,7 +233,16 @@
239233
<Content Include="Views\Shared\_Layout.cshtml" />
240234
<Content Include="Scripts\jquery-1.10.2.min.map" />
241235
</ItemGroup>
242-
<ItemGroup />
236+
<ItemGroup>
237+
<ProjectReference Include="..\ClearScript.Manager.Http\ClearScript.Manager.Http.csproj">
238+
<Project>{190ef179-83f2-4091-ab95-a609d278accc}</Project>
239+
<Name>ClearScript.Manager.Http</Name>
240+
</ProjectReference>
241+
<ProjectReference Include="..\ClearScript.Manager\ClearScript.Manager.csproj">
242+
<Project>{cfab8382-b76f-4aa1-ab38-52674f932e52}</Project>
243+
<Name>ClearScript.Manager</Name>
244+
</ProjectReference>
245+
</ItemGroup>
243246
<ItemGroup>
244247
<Content Include="fonts\glyphicons-halflings-regular.woff" />
245248
<Content Include="fonts\glyphicons-halflings-regular.ttf" />

src/ClearScript.Manager.WebDemo/Controllers/ValuesController.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ public string Get(int id)
3030
public async Task<dynamic> Post([FromBody]Script script)
3131
{
3232
var scriptId = Guid.NewGuid();
33-
//using (var scope = new ManagerScope())
34-
//{
35-
//dynamic host = new ExpandoObject();
36-
var host = new TestModel();
33+
using (var scope = new ManagerScope())
34+
{
35+
dynamic host = new ExpandoObject();
36+
//var host = new TestModel();
3737
var option = new ExecutionOptions
3838
{
3939
HostObjects = new List<HostObject> {new HostObject {Name = "host", Target = host}}
4040
};
4141

42-
var engine = new V8ScriptEngine();
43-
engine.AddHostObject("host", HostItemFlags.None, host);
44-
engine.Execute(script.Text);
45-
//await scope.RuntimeManager.ExecuteAsync(scriptId.ToString(), script.Text, option);
42+
//var engine = new V8ScriptEngine();
43+
//engine.AddHostObject("host", HostItemFlags.None, host);
44+
//engine.Execute(script.Text);
45+
await scope.RuntimeManager.ExecuteAsync(scriptId.ToString(), script.Text, option);
4646

4747
return host;
48-
//}
48+
}
4949
}
5050

5151
// PUT api/values/5

src/ClearScript.Manager/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.3.0.*")]
35-
[assembly: AssemblyFileVersion("1.3.0.*")]
34+
[assembly: AssemblyVersion("1.3.1.*")]
35+
[assembly: AssemblyFileVersion("1.3.1.*")]

0 commit comments

Comments
 (0)