Skip to content

Commit

Permalink
Disabled for now until we know what to do with runtime deps - referen…
Browse files Browse the repository at this point in the history
  • Loading branch information
forki authored and viktor-svub committed Jan 18, 2018
1 parent dc0eecf commit 403cae0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
6 changes: 5 additions & 1 deletion .paket/Paket.Restore.targets
Expand Up @@ -23,6 +23,9 @@
<_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
<PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>

<!-- no extension is a shell script -->
<PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>

<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
Expand Down Expand Up @@ -145,9 +148,10 @@
</DotNetCliToolReference>
</ItemGroup>

<!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964
<PropertyGroup>
<RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
</PropertyGroup>
</PropertyGroup> -->

</Target>

Expand Down
5 changes: 2 additions & 3 deletions RELEASE_NOTES.md
@@ -1,7 +1,6 @@
#### 5.130.8 - 2018-01-17
#### 5.131.0 - 2018-01-18
* WORKAROUND: Disable NuGt.Config to allow runtime deps restore - https://github.com/fsprojects/Paket/issues/2964
* BUGFIX: Fixed PaketExePath with shell script (without extension) - https://github.com/fsprojects/Paket/pull/2989

#### 5.130.7 - 2018-01-17
* BUGFIX: Fixed "Could not parse version range" - https://github.com/fsprojects/Paket/issues/2988

#### 5.130.3 - 2018-01-11
Expand Down
3 changes: 2 additions & 1 deletion src/Paket.Core/embedded/Paket.Restore.targets
Expand Up @@ -148,9 +148,10 @@
</DotNetCliToolReference>
</ItemGroup>

<!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964
<PropertyGroup>
<RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
</PropertyGroup>
</PropertyGroup> -->

</Target>

Expand Down

0 comments on commit 403cae0

Please sign in to comment.