Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Azure/AutoRest into netcore
Browse files Browse the repository at this point in the history
  • Loading branch information
Hovsep Mkrtchyan committed May 17, 2016
2 parents 71bc552 + b39ebd5 commit 111d7d5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion AutoRest/AutoRest.Core/AutoRest.nuget.proj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<SdkNuGetPackage Include="AutoRest">
<PackageVersion>0.16.0$(NightlyBuildVersion)</PackageVersion>
<PackageVersion>0.17.0$(NightlyBuildVersion)</PackageVersion>
<!--Want to prevent NuGet from reporting warnings
like we are not putting assemblies under the \lib folder-->
<NoPackageAnalysis>true</NoPackageAnalysis>
Expand Down
4 changes: 2 additions & 2 deletions AutoRest/AutoRest.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
[assembly: AssemblyCompany("Microsoft Corporation")]
[assembly: AssemblyProduct("Microsoft AutoRest")]
[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation")]
[assembly: AssemblyVersion("0.16.0.0")]
[assembly: AssemblyFileVersion("0.16.0.0")]
[assembly: AssemblyVersion("0.17.0.0")]
[assembly: AssemblyFileVersion("0.17.0.0")]

[assembly: NeutralResourcesLanguage("en")]
[assembly: CLSCompliant(true)]
Expand Down
2 changes: 1 addition & 1 deletion AutoRest/NugetPackageTest/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Rest.ClientRuntime" version="2.2.0" targetFramework="net45" />
<package id="autorest" version="0.16.0" targetFramework="net45" />
<package id="autorest" version="0.17.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
Expand Down

0 comments on commit 111d7d5

Please sign in to comment.