Skip to content

Commit 8a186fa

Browse files
committed
Merge branch 'release/3.4.0-beta' into dev
2 parents 21d2b94 + f7d15f0 commit 8a186fa

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

src/.nuget/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="NuGetPowerTools" version="0.29" />
4+
<package id="Rx-Main" version="2.1.30214.0" />
45
</packages>

src/Patterns/SolutionAssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
[assembly: AssemblyCulture(ProductStrings.Empty)]
3434
[assembly: ComVisible(false)]
3535
[assembly: NeutralResourcesLanguage("en-US")]
36-
[assembly: AssemblyVersion("3.3.2")]
37-
[assembly: AssemblyFileVersion("3.3.2.0")]
38-
[assembly: AssemblyInformationalVersion("3.3.2-beta")]
36+
[assembly: AssemblyVersion("3.4.0")]
37+
[assembly: AssemblyFileVersion("3.4.0.0")]
38+
[assembly: AssemblyInformationalVersion("3.4.0-beta")]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<#+
22
public int MajorVersion = 3;
3-
public int MinorVersion = 3;
4-
public int Revision = 2;
3+
public int MinorVersion = 4;
4+
public int Revision = 0;
55
public bool IsPreRelease = true;
66
#>

src/_specs/_specs.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<SpecificVersion>False</SpecificVersion>
4242
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
4343
</Reference>
44+
<Reference Include="Autofac.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
47+
</Reference>
4448
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4549
<SpecificVersion>False</SpecificVersion>
4650
<HintPath>..\packages\Castle.Core.3.2.0\lib\net40-client\Castle.Core.dll</HintPath>

0 commit comments

Comments
 (0)