Merge
This commit is contained in:
parent
65594c80cc
commit
71a78e17d7
5 changed files with 10 additions and 10 deletions
|
@ -1,7 +1,7 @@
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// This code was generated by a tool.
|
||||||
// Runtime Version:4.0.30319.17929
|
// Runtime Version:4.0.30319.18010
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
// the code is regenerated.
|
// the code is regenerated.
|
||||||
|
@ -15,8 +15,8 @@ using System.Runtime.InteropServices;
|
||||||
|
|
||||||
[assembly: AssemblyCompany("Outercurve Foundation")]
|
[assembly: AssemblyCompany("Outercurve Foundation")]
|
||||||
[assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")]
|
[assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")]
|
||||||
[assembly: AssemblyVersion("2.0.0.1")]
|
[assembly: AssemblyVersion("2.1.0.1")]
|
||||||
[assembly: AssemblyFileVersion("2.0.0.1")]
|
[assembly: AssemblyFileVersion("2.1.0.1")]
|
||||||
[assembly: AssemblyInformationalVersion("2.0.0")]
|
[assembly: AssemblyInformationalVersion("2.1.0")]
|
||||||
|
|
||||||
|
|
||||||
|
|
Binary file not shown.
|
@ -15,9 +15,9 @@ Imports System
|
||||||
Imports System.Reflection
|
Imports System.Reflection
|
||||||
Imports System.Runtime.CompilerServices
|
Imports System.Runtime.CompilerServices
|
||||||
Imports System.Runtime.InteropServices
|
Imports System.Runtime.InteropServices
|
||||||
<Assembly: AssemblyCompany("Outercurve Foundation"), _
|
<Assembly: AssemblyCompany("Outercurve Foundation"), _
|
||||||
Assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation."), _
|
Assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation."), _
|
||||||
Assembly: AssemblyVersion("2.1.0.1"), _
|
Assembly: AssemblyVersion("2.1.0.1"), _
|
||||||
Assembly: AssemblyFileVersion("2.1.0.1"), _
|
Assembly: AssemblyFileVersion("2.1.0.1"), _
|
||||||
Assembly: AssemblyInformationalVersion("2.1.0")>
|
Assembly: AssemblyInformationalVersion("2.1.0")>
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
%windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:BuildWebPlatformInstallerFeed /p:BuildConfiguration=Debug /p:Version="2.1.0" /p:FileVersion="2.1.0.1" /p:VersionLabel="2.1.0.1" /v:n /fileLogger /m
|
%windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:Deploy /p:BuildConfiguration=Debug /p:Version="2.1.0" /p:FileVersion="2.1.0.1" /p:VersionLabel="2.1.0.1" /v:n /fileLogger /m
|
|
@ -1 +1 @@
|
||||||
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:BuildWebPlatformInstallerFeed /p:BuildConfiguration=Release /p:Version="2.1.0" /p:FileVersion="2.1.0.1" /p:VersionLabel="2.1.0.1" /v:n /fileLogger /m
|
%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Deploy /p:BuildConfiguration=Release /p:Version="2.1.0" /p:FileVersion="2.1.0.1" /p:VersionLabel="2.1.0.1" /v:n /fileLogger /m
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue