Skip to content

Commit c7708a3

Browse files
committed
Restore packages into Tools folder
1 parent fa8f90c commit c7708a3

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

ReleaseProcedure.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ These are the tasks typically needed to create an official NHibernate release.
44
that is about to happen (as these will show in the milestone).
55

66
* Create a draft release in Github with GitReleaseManager. If you have used
7-
the NHibernate build menu, it should be available in %userprofile%\.nuget\packages\gitreleasemanager\x.x.x\
7+
the NHibernate build menu, it should be available in Tools\gitreleasemanager\x.x.x\
88
(change x.x.x by its current version in tools).
99
By example:
1010

11-
%userprofile%\.nuget\packages\gitreleasemanager\0.7.0\tools\GitReleaseManager.exe create -o nhibernate -r nhibernate-core -m 5.1 -u username -p password
11+
Tools\gitreleasemanager\0.7.0\tools\GitReleaseManager.exe create -o nhibernate -r nhibernate-core -m 5.1 -u username -p password
1212

1313
(Adjust the -m milestone parameter above, and add "-c branchname" if
1414
releasing another branch than master)

ShowBuildMenu.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set BUILD_TOOL_PATH=%~dp0Tools\BuildTool\bin\BuildTool.dll
1010
set BUILDTOOL=dotnet %BUILD_TOOL_PATH%
1111
set AVAILABLE_CONFIGURATIONS=%~dp0available-test-configurations
1212
set CURRENT_CONFIGURATION=%~dp0current-test-configuration
13-
set NUNIT="%userprofile%\.nuget\packages\NUnit.ConsoleRunner\%NUNIT_VERSION%\tools\nunit3-console.exe"
13+
set NUNIT="%~dp0Tools\NUnit.ConsoleRunner\%NUNIT_VERSION%\tools\nunit3-console.exe"
1414

1515
if not exist %BUILD_TOOL_PATH% (
1616
dotnet build %~dp0Tools\BuildTool\BuildTool.sln -c Release -o bin

ShowBuildMenu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ generateAsync(){
178178

179179
getAsyncGeneratorPath
180180
cd src
181-
dotnet "$async_generator_path"
181+
dotnet ../"$async_generator_path"
182182
cd ..
183183

184184
mainMenu
@@ -193,7 +193,7 @@ getAsyncGeneratorPath(){
193193
cd Tools
194194

195195
async_generator_version="$(cat packages.csproj | grep Include=\"CSharpAsyncGenerator.CommandLine | cut -d\" -f4)"
196-
async_generator_path="$HOME/.nuget/packages/csharpasyncgenerator.commandline/$async_generator_version/tools"
196+
async_generator_path="Tools/csharpasyncgenerator.commandline/$async_generator_version/tools"
197197

198198
if [ ! -d $async_generator_path ]
199199
then

Tools/.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
nuget.exe
22
NUnit.*
3-
vswhere.*
4-
CSharpAsyncGenerator.CommandLine.*
5-
gitreleasemanager.*
3+
vswhere/
4+
csharpasyncgenerator.commandline/
5+
gitreleasemanager/
66
SQLitePCLRaw.core.*
77
obj/

Tools/actual_msbuild.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22

3-
for /f "usebackq tokens=*" %%i in (`%userprofile%\.nuget\pacakges\vswhere2\2.1.4\tools\vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
3+
for /f "usebackq tokens=*" %%i in (`%~dp0\vswhere\2.1.4\tools\vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
44
set InstallDir=%%i
55
)
66

build-common/common.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<target name="common.tools-restore" depends="common.init">
4343
<exec workingdir="${root.dir}/Tools" program="dotnet" verbose="true">
44-
<arg line="restore ./packages.csproj" />
44+
<arg line="restore ./packages.csproj --packages ." />
4545
</exec>
4646
</target>
4747

default.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
file="${tools.dir}/packages.csproj"
6060
xpath="/Project/ItemGroup/PackageReference[@Include = '${tool-id}']/@Version"
6161
property="tool-version" />
62-
<property name="tool-path" value="${environment::get-folder-path('UserProfile')}/.nuget/packages/${tool-id}/${tool-version}/" />
62+
<property name="tool-path" value="${tools.dir}/${tool-id}/${tool-version}/" />
6363
</target>
6464

6565
<target name="find-async-generator-console">
@@ -70,7 +70,7 @@
7070

7171
<target name="generate-async" depends="solution-restore find-async-generator-console">
7272
<exec workingdir="${root.dir}/src" program="dotnet" verbose="true">
73-
<arg line="${async-generator-console}" />
73+
<arg line=".${async-generator-console}" />
7474
</exec>
7575
</target>
7676

0 commit comments

Comments
 (0)