Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2d0452a

Browse files
committed
move NuGet.Config to the root
1 parent161b3c2 commit2d0452a

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

‎DEVGUIDE.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ For **Release**:
212212

213213
If you are behind a proxy server, NuGet client tool must be configured to use it:
214214

215-
.nuget\nuget.exe config -set http_proxy=proxy.domain.com:8080 -ConfigFile.nuget\NuGet.Config
216-
.nuget\nuget.exe config -set http_proxy.user=user_name -ConfigFile.nuget\NuGet.Config
217-
.nuget\nuget.exe config -set http_proxy.password=user_password -ConfigFile.nuget\NuGet.Config
215+
.nuget\nuget.exe config -set http_proxy=proxy.domain.com:8080 -ConfigFile NuGet.Config
216+
.nuget\nuget.exe config -set http_proxy.user=user_name -ConfigFile NuGet.Config
217+
.nuget\nuget.exe config -set http_proxy.password=user_password -ConfigFile NuGet.Config
218218

219219
Where you should set proper proxy address, user name and password.
220220

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(topsrcdir)mono/config.make
33
.PHONY: restore build build-proto
44

55
restore:
6-
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config
6+
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile ./NuGet.Config
77
chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe
88
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
99
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe

‎.nuget/NuGet.Config‎renamed to ‎NuGet.Config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<packageSources>
88
<!--To inherit the global NuGet package sources remove the <clear/> line below-->
99
<clear />
10-
<addkey="artifacts"value="../artifacts" />
11-
<addkey="artifacts"value="../artifacts/4.2" />
10+
<addkey="artifacts"value="./artifacts" />
11+
<addkey="artifacts"value="./artifacts/4.2" />
1212
<addkey="myget.org fsharp-daily"value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
1313
<addkey="myget.org roslyn-master-nightly"value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
1414
<addkey="dotnet-core"value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure
599599
echo ---------------- Done with prepare, starting package restore ----------------
600600

601601
set_nugetexe="%~dp0.nuget\NuGet.exe"
602-
set_nugetconfig="%~dp0.nuget\NuGet.Config"
602+
set_nugetconfig="%~dp0NuGet.Config"
603603

604604
if"%RestorePackages%"=="true" (
605605
if"%BUILD_FCS%"=="1" (

‎fcs/build.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Target "Restore" (fun _ ->
9090
ExecProcess(fun info->
9191
info.FileName<- FullName@"./../.nuget/NuGet.exe"
9292
info.WorkingDirectory<- FullName@"./.."
93-
info.Arguments<- sprintf"restore%s -PackagesDirectory\"%s\" -ConfigFile\"%s\""(FullName p)(FullName"./../packages")(FullName"./../.nuget/NuGet.Config")) TimeSpan.MaxValue
93+
info.Arguments<- sprintf"restore%s -PackagesDirectory\"%s\" -ConfigFile\"%s\""(FullName p)(FullName"./../packages")(FullName"./../NuGet.Config")) TimeSpan.MaxValue
9494
if result<>0then failwithf"nuget restore%s failed" p
9595
)
9696

‎src/FSharpSource.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@
172172

173173
<NuGetToolPathCondition="'$(NuGetToolPath)' == ''">$(FSharpSourcesRoot)\..\.nuget\</NuGetToolPath>
174174
<NuGetConfigCommandLine>-ConfigFile "$(NuGetConfigFile)"</NuGetConfigCommandLine>
175-
<NugetRestoreCommand>"$(NuGetToolPath)NuGet.exe install -OutputDirectory "$(PackagesDir)" -Config "$(NuGetToolPath)NuGet.Config"</NugetRestoreCommand>
176-
<DnuRestoreCommand>"$(NuGetToolPath)NuGet.exe" restore -OutputDirectory "$(PackagesDir)" -Config "$(NuGetToolPath)NuGet.Config"</DnuRestoreCommand>
175+
<NugetRestoreCommand>"$(NuGetToolPath)NuGet.exe install -OutputDirectory "$(PackagesDir)" -Config "$(NuGetToolPath)..\NuGet.Config"</NugetRestoreCommand>
176+
<DnuRestoreCommand>"$(NuGetToolPath)NuGet.exe" restore -OutputDirectory "$(PackagesDir)" -Config "$(NuGetToolPath)..\NuGet.Config"</DnuRestoreCommand>
177177

178178
<!-- Current version of .NET Core does not support all semantics used in our packages,
179179
so we ignore the pre-calculation in the lock file and calculate asset applicability in the build task-->
@@ -214,12 +214,12 @@
214214
<ImportProject="Microbuild.Settings.targets"Condition="'$(UseMicroBuild)' == 'true'"/>
215215

216216
<TargetName="dotnetrestore"BeforeTargets="Build"Condition=" '$(TargetDotnetProfile)' == 'coreclr'">
217-
<ExecCommand="$(MSBuildThisFileDirectory)..\.nuget\nuget.exe restore -PackagesDirectory $(PackagesDir) -Config $(MSBuildThisFileDirectory)..\.nuget\NuGet.Config project.json" />
217+
<ExecCommand="$(MSBuildThisFileDirectory)..\.nuget\nuget.exe restore -PackagesDirectory $(PackagesDir) -Config $(MSBuildThisFileDirectory)..\NuGet.Config project.json" />
218218
</Target>
219219

220220
<TargetName="dotnetrestore"BeforeTargets="Build"Condition=" '$(DOTNET_PUBLISH)' == 'true'">
221221
<SetEnvVarName="NUGET_PACKAGES"Value="$(NUGET_PACKAGES)" />
222-
<ExecCommand="$(MSBuildThisFileDirectory)..\Tools\dotnetcli\dotnet.exe restore&#45;&#45;configfile $(MSBuildThisFileDirectory)..\.nuget\NuGet.Config project.json"/>
222+
<ExecCommand="$(MSBuildThisFileDirectory)..\Tools\dotnetcli\dotnet.exe restore&#45;&#45;configfile $(MSBuildThisFileDirectory)..\NuGet.Config project.json"/>
223223
</Target>
224224

225225
<TargetName="dotnetpublish"AfterTargets="Build"Condition=" '$(DOTNET_PUBLISH)' == 'true'">

‎vsintegration/vsintegration.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
33
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<TargetName="RestoreVsIntegrationPackages"BeforeTargets="Build"Condition="'$(RestorePackages)' == ''">
5-
<ExecCommand=".\.nuget\NuGet.exe restore vsintegration\packages.config -PackagesDirectory packages -ConfigFile .\.nuget\NuGet.Config"WorkingDirectory="$(FSharpSourcesRoot)\.." />
5+
<ExecCommand=".\.nuget\NuGet.exe restore vsintegration\packages.config -PackagesDirectory packages -ConfigFile .\NuGet.Config"WorkingDirectory="$(FSharpSourcesRoot)\.." />
66
</Target>
77
</Project>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp