Skip to content

Commit

Permalink
Merge pull request #885 from DustinCampbell/preview2-fix
Browse files Browse the repository at this point in the history
Move back to NuGet 4.0.0 RTM packages
  • Loading branch information
DustinCampbell authored Jun 6, 2017
2 parents 10ded38 + ef9d8a4 commit e6f8077
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/OmniSharp.Abstractions/OmniSharp.Abstractions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Include="NuGet.Versioning" Version="4.3.0-beta1-2418" />
<PackageReference Include="NuGet.Versioning" Version="4.0.0" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<PackageReference Include="Microsoft.Build.Framework" Version="15.3.0-preview-000117-01" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.0-preview-000117-01" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.3.0-preview-000117-01" />
<PackageReference Include="NuGet.Packaging.Core" Version="4.3.0-beta1-2418" />
<PackageReference Include="NuGet.ProjectModel" Version="4.3.0-beta1-2418" />
<PackageReference Include="NuGet.Versioning" Version="4.3.0-beta1-2418" />
<PackageReference Include="NuGet.Packaging.Core" Version="4.0.0" />
<PackageReference Include="NuGet.ProjectModel" Version="4.0.0" />
<PackageReference Include="NuGet.Versioning" Version="4.0.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.6.0" />
</ItemGroup>

Expand Down
10 changes: 5 additions & 5 deletions tests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NuGet.Frameworks" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NuGet.Packaging" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NuGet.Packaging.Core.Types" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NuGet.RuntimeModel" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NuGet.Versioning" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
Expand Down

0 comments on commit e6f8077

Please sign in to comment.