Skip to content

Commit

Permalink
Update Rx, release preparation
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewvk committed Jul 2, 2017
1 parent 43c1bdb commit ee4b0f2
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 90 deletions.
5 changes: 2 additions & 3 deletions nuget/CodeJam.Extensibility.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
<tags>extensibility plugin dynamic</tags>
<dependencies>
<dependency id="CodeJam" version="1.3.0" />
<dependency id="Rx-Interfaces" version="2.2.5" />
<dependency id="Rx-Core" version="2.2.5" />
<dependency id="Rx-Linq" version="2.2.5" />
<dependency id="System.Reactive.Interfaces" version="3.1.1" />
<dependency id="System.Reactive.Core" version="3.1.1" />
</dependencies>
</metadata>
<files>
Expand Down
17 changes: 11 additions & 6 deletions nuget/Readme.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
CodeJam 1.0.0-beta1 Release Notes
---------------------------------------

What's new in 1.0.0-beta6
-------------------------
* Move general services code to CodeJam project
CodeJam 1.0.0-beta7 Release Notes
---------------------------------------

What's new in 1.0.0-beta7
-------------------------
* Update CodeJam, use CodeJam.Blocks
* Replace Rx to new packages System.Reactive.*

What's new in 1.0.0-beta6
-------------------------
* Move general services code to CodeJam project
125 changes: 62 additions & 63 deletions src/AppResources/Razor/RazorGenAppResource.cs
Original file line number Diff line number Diff line change
@@ -1,64 +1,63 @@
using System;
using System.Globalization;
using System.IO;
using System.Reactive.Disposables;

namespace CodeJam.Extensibility.Razor
{
/// <summary>
/// Base class for generators generated by RazorGenerator (http://razorgenerator.codeplex.com/).
/// </summary>
public abstract class RazorGenAppResource : TextAppResource
{
private TextWriter _writer;

/// <summary>
/// Initialize instance.
/// </summary>
protected RazorGenAppResource(IServiceProvider svcProvider) : base(svcProvider)
{}

/// <summary>
/// Required by RazorGenerator.
/// </summary>
public abstract void Execute();

/// <summary>
///
/// </summary>
protected IDisposable WriterGuard(TextWriter writer)
{
var oldWriter = _writer;
_writer = writer;
return Disposable.Create(() => _writer = oldWriter);
}

/// <summary>
/// Write text to output.
/// </summary>
protected override void WriteText(AppResourceRequest request, TextWriter writer)
{
using (WriterGuard(writer))
Execute();
}

/// <summary>
/// Write string literal to output.
/// </summary>
protected void WriteLiteral(string literal)
{
_writer.Write(literal);
}

/// <summary>
/// Write object to output.
/// </summary>
protected void Write(object value)
{
if ((value == null))
return;

WriteLiteral(Convert.ToString(value, CultureInfo.InvariantCulture));
}
}
using System;
using System.Globalization;
using System.IO;

namespace CodeJam.Extensibility.Razor
{
/// <summary>
/// Base class for generators generated by RazorGenerator (http://razorgenerator.codeplex.com/).
/// </summary>
public abstract class RazorGenAppResource : TextAppResource
{
private TextWriter _writer;

/// <summary>
/// Initialize instance.
/// </summary>
protected RazorGenAppResource(IServiceProvider svcProvider) : base(svcProvider)
{}

/// <summary>
/// Required by RazorGenerator.
/// </summary>
public abstract void Execute();

/// <summary>
///
/// </summary>
protected IDisposable WriterGuard(TextWriter writer)
{
var oldWriter = _writer;
_writer = writer;
return Disposable.Create(() => _writer = oldWriter);
}

/// <summary>
/// Write text to output.
/// </summary>
protected override void WriteText(AppResourceRequest request, TextWriter writer)
{
using (WriterGuard(writer))
Execute();
}

/// <summary>
/// Write string literal to output.
/// </summary>
protected void WriteLiteral(string literal)
{
_writer.Write(literal);
}

/// <summary>
/// Write object to output.
/// </summary>
protected void Write(object value)
{
if ((value == null))
return;

WriteLiteral(Convert.ToString(value, CultureInfo.InvariantCulture));
}
}
}
10 changes: 4 additions & 6 deletions src/CodeJam.Extensibility.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,11 @@
<HintPath>..\packages\CodeJam.Blocks.1.3.1\lib\net46\CodeJam.Blocks.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
<Private>True</Private>
<Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
<Private>True</Private>
<Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions src/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="CodeJam" version="1.3.0" targetFramework="net46" />
<package id="CodeJam.Blocks" version="1.3.1" targetFramework="net46" />
<package id="Rx-Core" version="2.2.5" targetFramework="net452" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net452" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net46" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net46" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net46" />
</packages>
12 changes: 6 additions & 6 deletions tests/CodeJam.Extensibility-Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
<Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
<Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
<Reference Include="System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion tests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CodeJam" publicKeyToken="7662d8fd5b220919" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="1.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
6 changes: 3 additions & 3 deletions tests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<package id="CodeJam.Blocks" version="1.3.1" targetFramework="net46" />
<package id="JetBrains.Annotations" version="10.4.0" targetFramework="net46" />
<package id="NUnit" version="3.7.1" targetFramework="net46" />
<package id="Rx-Core" version="2.2.5" targetFramework="net46" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net46" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net46" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net46" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net46" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net46" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net46" />
</packages>

0 comments on commit ee4b0f2

Please sign in to comment.