Skip to content
This repository was archived by the owner on Mar 20, 2019. It is now read-only.

Commit 3175971

Browse files
author
David Christiansen
committed
File tidy
1 parent bcf4ae4 commit 3175971

5 files changed

Lines changed: 40 additions & 717 deletions

File tree

‎src/.nuget/NuGet.exe‎

58.5 KB
Binary file not shown.

‎src/.nuget/NuGet.targets‎

Lines changed: 40 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,74 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5-
5+
66
<!-- Enable the restore command to run before builds -->
7-
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
7+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
88

99
<!-- Property that enables building a package from a project -->
1010
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
1111

1212
<!-- Determines if package restore consent is required to restore packages -->
13-
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'true' ">false</RequireRestoreConsent>
14-
13+
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
14+
1515
<!-- Download NuGet.exe if it does not already exist -->
1616
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
1717
</PropertyGroup>
18-
18+
1919
<ItemGroup Condition=" '$(PackageSources)' == '' ">
2020
<!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
21-
<!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
21+
<!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
2222
<!--
23-
<PackageSource Include="https://nuget.org/api/v2/" />
23+
<PackageSource Include="https://www.nuget.org/api/v2/" />
2424
<PackageSource Include="https://my-nuget-source/nuget/" />
2525
-->
2626
</ItemGroup>
2727

2828
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
2929
<!-- Windows specific commands -->
3030
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
31-
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
32-
<PackagesDir>$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
3331
</PropertyGroup>
34-
32+
3533
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
3634
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
3735
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
38-
<PackagesConfig>packages.config</PackagesConfig>
39-
<PackagesDir>$(SolutionDir)packages</PackagesDir>
36+
</PropertyGroup>
37+
38+
<PropertyGroup>
39+
<PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
40+
<PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
41+
</PropertyGroup>
42+
43+
<PropertyGroup>
44+
<PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
45+
<PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
4046
</PropertyGroup>
4147

4248
<PropertyGroup>
4349
<!-- NuGet command -->
44-
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
50+
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
4551
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
46-
52+
4753
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
48-
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
54+
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand>
4955

5056
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
51-
57+
5258
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
59+
<NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
60+
61+
<PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
62+
<PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
63+
5364
<!-- Commands -->
54-
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -o "$(PackagesDir)"</RestoreCommand>
55-
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
65+
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
66+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
5667

5768
<!-- We need to ensure packages are restored prior to assembly resolve -->
58-
<ResolveReferencesDependsOn Condition="$(RestorePackages) == 'true'">
69+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
5970
RestorePackages;
60-
$(ResolveReferencesDependsOn);
61-
</ResolveReferencesDependsOn>
71+
$(BuildDependsOn);
72+
</BuildDependsOn>
6273

6374
<!-- Make the build depend on restore packages -->
6475
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
@@ -70,37 +81,36 @@
7081
<Target Name="CheckPrerequisites">
7182
<!-- Raise an error if we're unable to locate nuget.exe -->
7283
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
73-
<SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
7484
<!--
7585
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
7686
This effectively acts as a lock that makes sure that the download operation will only happen once and all
7787
parallel builds will have to wait for it to complete.
7888
-->
79-
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
89+
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
8090
</Target>
8191

8292
<Target Name="_DownloadNuGet">
8393
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
8494
</Target>
8595

86-
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
96+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
8797
<Exec Command="$(RestoreCommand)"
8898
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
89-
99+
90100
<Exec Command="$(RestoreCommand)"
91101
LogStandardErrorAsError="true"
92102
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
93103
</Target>
94104

95105
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
96-
<Exec Command="$(BuildCommand)"
106+
<Exec Command="$(BuildCommand)"
97107
Condition=" '$(OS)' != 'Windows_NT' " />
98-
108+
99109
<Exec Command="$(BuildCommand)"
100110
LogStandardErrorAsError="true"
101111
Condition=" '$(OS)' == 'Windows_NT' " />
102112
</Target>
103-
113+
104114
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
105115
<ParameterGroup>
106116
<OutputFilename ParameterType="System.String" Required="true" />
@@ -119,7 +129,7 @@
119129
120130
Log.LogMessage("Downloading latest version of NuGet.exe...");
121131
WebClient webClient = new WebClient();
122-
webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
132+
webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
123133
124134
return true;
125135
}
@@ -131,23 +141,4 @@
131141
</Code>
132142
</Task>
133143
</UsingTask>
134-
135-
<UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
136-
<ParameterGroup>
137-
<EnvKey ParameterType="System.String" Required="true" />
138-
<EnvValue ParameterType="System.String" Required="true" />
139-
</ParameterGroup>
140-
<Task>
141-
<Using Namespace="System" />
142-
<Code Type="Fragment" Language="cs">
143-
<![CDATA[
144-
try {
145-
Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
146-
}
147-
catch {
148-
}
149-
]]>
150-
</Code>
151-
</Task>
152-
</UsingTask>
153-
</Project>
144+
</Project>

‎src/C# formatting rules.reg‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)