Skip to content

Commit

Permalink
Updated version to 2.11
Browse files Browse the repository at this point in the history
  • Loading branch information
alpaix committed Dec 16, 2015
1 parent 6ebd488 commit 92ce0fa
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions Build/Build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
</PropertyGroup>

<PropertyGroup>
<!-- Specifiy the NuGet release version. When make changes here, please also change the version numbers
<!-- Specifiy the NuGet release version. When make changes here, please also change the version numbers
in Common\CommonAssemblyInfo.cs so the version numbers are consistent between binaries built on
build servers and those built locally. -->
<MajorVersion>2</MajorVersion>
<MinorVersion>10</MinorVersion>
<Patch>1</Patch>
<MinorVersion>11</MinorVersion>
<Patch>0</Patch>
<Revision>$(BUILD_NUMBER)</Revision>

<!-- This is the file version of the DLLs/EXE produced. It's also the version of the vsix -->
Expand Down Expand Up @@ -109,7 +109,7 @@
<TestProjects Include="$(NuGetTestRoot)\Server.Test\Server.Test.csproj" Condition="'$(MonoBuild)' == ''" />
<TestProjects Include="$(NuGetTestRoot)\Dialog.Test\Dialog.Test.csproj" Condition="'$(MonoBuild)' == ''" />
<TestProjects Include="$(NuGetTestRoot)\VisualStudio.Test\VisualStudio.Test.csproj" Condition="'$(MonoBuild)' == ''" />
<TestProjects Include="$(NuGetTestRoot)\VisualStudio11.Test\VisualStudio11.Test.csproj"
<TestProjects Include="$(NuGetTestRoot)\VisualStudio11.Test\VisualStudio11.Test.csproj"
Condition="'$(MonoBuild)' == '' and $(VisualStudioVersion) != '10.0'" />
<TestProjects Include="$(NuGetTestRoot)\PowerShellCmdlets.Test\PowerShellCmdlets.Test.csproj" Condition="'$(MonoBuild)' == ''" />
<TestProjects Include="$(NuGetTestRoot)\PowerShellHost.Test\PowerShellHost.Test.csproj" Condition="'$(MonoBuild)' == ''" />
Expand All @@ -125,7 +125,7 @@

<Target Name="Go"
DependsOnTargets="CheckFxCop; UpdateVsixVersion; RestorePackages; Build; ReportFxCopResults;
VerifyAssembliesInVsix; RunTests; CreateDropDirectories; CopyExecutableOutputToDropDirectory;
VerifyAssembliesInVsix; RunTests; CreateDropDirectories; CopyExecutableOutputToDropDirectory;
CopyServerExtensionsOutputToDropDirectory;
CopyVisualStudioAddInOutputToDropDirectory; CopyEndToEndTestsToDropDirectory;
CopyServerOutputToDropDirectory; CopyLicenseToAllDirectories; BuildPackages">
Expand Down Expand Up @@ -154,7 +154,7 @@
<PropertyGroup>
<PackageSources>https://www.nuget.org/api/v2/</PackageSources>
</PropertyGroup>

<Message Text="Restoring NuGet packages" Importance="High" />
<Exec Command="&quot;$(ExeBuildDirectory)\NuGet.exe&quot; restore -source &quot;$(PackageSources)&quot;" WorkingDirectory="$(NuGetRoot)" Condition="'$(MonoBuild)' == ''" />
<Exec Command="mono $(ExeBuildDirectory)\NuGet.exe restore -source &quot;$(PackageSources)&quot;" WorkingDirectory="$(NuGetRoot)" Condition="'$(MonoBuild)' == 'true'"/>
Expand Down Expand Up @@ -210,10 +210,10 @@
<UnwantedAssembly Include="$(TempVsixDirectory)\NuGet.VisualStudio14.dll" />
<UnwantedAssembly Include="$(TempVsixDirectory)\NuGet.TeamFoundationServer.dll"></UnwantedAssembly>
</ItemGroup>

<Delete Files="@(InvalidFiles)" />
<Delete Files="@(UnwantedAssembly)" />

<Exec Command="&quot;$(ZipExe)&quot; a -r &quot;$(VisualStudioAddInBuildDirectory)\NuGet.Tools.zip&quot; &quot;$(TempVsixDirectory)\*.*&quot;" />

<Delete Files="$(VsixFileLocation)" />
Expand All @@ -222,7 +222,7 @@
<RemoveDir Directories="$(TempVsixDirectory)" ContinueOnError="true" />
</Target>

<Target Name="RunTests" Condition=" '$(DisableRunningUnitTests)' != 'true' ">
<Target Name="RunTests" Condition=" '$(DisableRunningUnitTests)' != 'true' ">
<MsBuild Projects="@(TestProjects)"
Targets="RunTests"
BuildInParallel="$(BuildTestsInParallel)" />
Expand Down
4 changes: 2 additions & 2 deletions Common/CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
// Build\Build.proj.
// When built locally, the NuGet release version is the values specified in this file.
#if !FIXED_ASSEMBLY_VERSION
[assembly: AssemblyVersion("2.10.1.0")]
[assembly: AssemblyInformationalVersion("2.10.1")]
[assembly: AssemblyVersion("2.11.0.0")]
[assembly: AssemblyInformationalVersion("2.11.0")]
#endif

[assembly: NeutralResourcesLanguage("en-US")]

0 comments on commit 92ce0fa

Please sign in to comment.