Move nuget.config, global.json and Directory.Packages.props to root
Putting these files in the root means they can be used by the test projects support projects that get copied to the `build` folder.
Rob Mensching committed
Feb 23, 2022 at 17:49 UTC
82bfd1218699a08c8d9cd775fc9e3eef3ec519a2
9 files changed
+18
-21
.gitignore
+3
-3
@@ -207,7 +207,7 @@ PublishScripts/
207
*.nuget.targets
208
209
# Nuget personal access tokens and Credentials
210
-nuget.config
210
+# nuget.config
211
212
# Microsoft Azure Build Output
213
csx/
@@ -391,8 +391,8 @@ FodyWeavers.xsd
391
# WiX Specific Ignores
392
393
# Ignore global.json and Directory.Package.props since they are generated
394
-src/global.json
395
-src/Directory.Packages.props
394
+global.json
395
+Directory.Packages.props
396
397
# Ignore downloaded tools
398
build/.tools/
nuget.config
renamed
+2
-2
@@ -1,12 +1,12 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<configuration>
3
<config>
4
- <add key="repositoryPath" value="..\packages" />
4
+ <add key="repositoryPath" value="packages" />
5
</config>
6
<packageSources>
7
<clear />
8
<add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
9
- <add key="build" value="..\build\artifacts" />
9
+ <add key="build" value="build\artifacts" />
10
<!-- <add key="github" value="https://nuget.pkg.github.com/wixtoolset/UnifiedTest1/index.json" /> -->
11
</packageSources>
12
</configuration>
src/build_official.cmd
+1
-1
@@ -1,7 +1,7 @@
1
@setlocal
2
@pushd %~dp0
3
4
-@copy nuget_official.config nuget.config
4
+@copy nuget_official.config ..\nuget.config
5
6
build_all.cmd Release Official
7
src/clean.cmd
+3
@@ -11,6 +11,9 @@ if exist ..\packages rd /s/q ..\packages
11
if exist Directory.Packages.props (del Directory.Packages.props)
12
if exist global.json (del global.json)
13
14
+if exist ..\Directory.Packages.props (del ..\Directory.Packages.props)
15
+if exist ..\global.json (del ..\global.json)
16
+
17
if exist "%_NUGET_CACHE%\wixbuildtools.testsupport" rd /s/q "%_NUGET_CACHE%\wixbuildtools.testsupport"
18
if exist "%_NUGET_CACHE%\wixtoolset.bal.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.bal.wixext"
19
if exist "%_NUGET_CACHE%\wixtoolset.balutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.balutil"
src/internal/SetBuildNumber/SetBuildNumber.proj
+2
-2
@@ -20,8 +20,8 @@
20
SetDirectoryPackagesProps;
21
</SetBuildNumbersDependsOn>
22
23
- <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\global.json))</GlobalJsonPath>
24
- <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\Directory.Packages.props))</CentralPackageVersionsPath>
23
+ <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonPath>
24
+ <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props))</CentralPackageVersionsPath>
25
</PropertyGroup>
26
27
<Target Name="SetAppVeyorBuildNumber"
src/nuget_official.config
+2
-2
@@ -1,12 +1,12 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<configuration>
3
<config>
4
- <add key="repositoryPath" value="..\packages" />
4
+ <add key="repositoryPath" value="packages" />
5
</config>
6
<packageSources>
7
<clear />
8
<add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
9
<!-- <add key="github" value="https://nuget.pkg.github.com/wixtoolset/UnifiedTest1/index.json" /> -->
10
- <add key="build" value="..\build\artifacts" />
10
+ <add key="build" value="build\artifacts" />
11
</packageSources>
12
</configuration>
src/test/wix/TestData/Directory.Packages.props
deleted
-9
@@ -1,9 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
-
4
-<Project>
5
- <!--
6
- This file prevents the import of WiX standard Directory.Packages.props
7
- from the root src directory
8
- -->
9
-</Project>
src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj
+5
-1
@@ -1,11 +1,15 @@
1
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
<Project Sdk='WixToolset.Sdk'>
4
+ <PropertyGroup>
5
+ <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
6
+ </PropertyGroup>
7
+
8
<ItemGroup>
9
<ProjectReference Include="..\VcxprojWindowsApp\VcxprojWindowsApp.vcxproj" />
10
<ProjectReference Include="..\WixprojLibraryVcxprojDll\WixprojLibraryVcxprojDll.wixproj" />
11
<ProjectReference Include="..\WixprojModuleCsprojWinFormsNetFx\WixprojModuleCsprojWinFormsNetFx.wixproj" />
12
9
- <PackageReference Include="Wixtoolset.UI.wixext" Version="4.0.0-preview.1-build.205" />
13
+ <PackageReference Include="Wixtoolset.UI.wixext" />
14
</ItemGroup>
15
</Project>
src/test/wix/WixE2E/WixE2E.csproj
-1
@@ -10,7 +10,6 @@
10
</PropertyGroup>
11
12
<ItemGroup>
13
- <Content Include="..\..\..\global.json" CopyToOutputDirectory="PreserveNewest" />
13
<Content Include="..\TestData\**" CopyToOutputDirectory="PreserveNewest" Link="TestData\%(RecursiveDir)%(Filename)%(Extension)" />
14
</ItemGroup>
15