diff options
author | Rob Mensching <rob@firegiant.com> | 2022-02-23 17:49:50 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-02-23 18:33:52 -0800 |
commit | 82bfd1218699a08c8d9cd775fc9e3eef3ec519a2 (patch) | |
tree | 75ba1cf7a63dea85fc51ff1a6557d12854b34f53 /src/test | |
parent | a19f847fe38ad9df88a0dc61ec2caa8ea0cd507f (diff) | |
download | wix-82bfd1218699a08c8d9cd775fc9e3eef3ec519a2.tar.gz wix-82bfd1218699a08c8d9cd775fc9e3eef3ec519a2.tar.bz2 wix-82bfd1218699a08c8d9cd775fc9e3eef3ec519a2.zip |
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.
Diffstat (limited to 'src/test')
3 files changed, 5 insertions, 11 deletions
diff --git a/src/test/wix/TestData/Directory.Packages.props b/src/test/wix/TestData/Directory.Packages.props deleted file mode 100644 index 5a625aca..00000000 --- a/src/test/wix/TestData/Directory.Packages.props +++ /dev/null | |||
@@ -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> | ||
diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj index bbd39870..63caf5c0 100644 --- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj +++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj | |||
@@ -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. --> | 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 | 2 | ||
3 | <Project Sdk='WixToolset.Sdk'> | 3 | <Project Sdk='WixToolset.Sdk'> |
4 | <PropertyGroup> | ||
5 | <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> | ||
6 | </PropertyGroup> | ||
7 | |||
4 | <ItemGroup> | 8 | <ItemGroup> |
5 | <ProjectReference Include="..\VcxprojWindowsApp\VcxprojWindowsApp.vcxproj" /> | 9 | <ProjectReference Include="..\VcxprojWindowsApp\VcxprojWindowsApp.vcxproj" /> |
6 | <ProjectReference Include="..\WixprojLibraryVcxprojDll\WixprojLibraryVcxprojDll.wixproj" /> | 10 | <ProjectReference Include="..\WixprojLibraryVcxprojDll\WixprojLibraryVcxprojDll.wixproj" /> |
7 | <ProjectReference Include="..\WixprojModuleCsprojWinFormsNetFx\WixprojModuleCsprojWinFormsNetFx.wixproj" /> | 11 | <ProjectReference Include="..\WixprojModuleCsprojWinFormsNetFx\WixprojModuleCsprojWinFormsNetFx.wixproj" /> |
8 | 12 | ||
9 | <PackageReference Include="Wixtoolset.UI.wixext" Version="4.0.0-preview.1-build.205" /> | 13 | <PackageReference Include="Wixtoolset.UI.wixext" /> |
10 | </ItemGroup> | 14 | </ItemGroup> |
11 | </Project> | 15 | </Project> |
diff --git a/src/test/wix/WixE2E/WixE2E.csproj b/src/test/wix/WixE2E/WixE2E.csproj index 21e1f9f2..031979b6 100644 --- a/src/test/wix/WixE2E/WixE2E.csproj +++ b/src/test/wix/WixE2E/WixE2E.csproj | |||
@@ -10,7 +10,6 @@ | |||
10 | </PropertyGroup> | 10 | </PropertyGroup> |
11 | 11 | ||
12 | <ItemGroup> | 12 | <ItemGroup> |
13 | <Content Include="..\..\..\global.json" CopyToOutputDirectory="PreserveNewest" /> | ||
14 | <Content Include="..\TestData\**" CopyToOutputDirectory="PreserveNewest" Link="TestData\%(RecursiveDir)%(Filename)%(Extension)" /> | 13 | <Content Include="..\TestData\**" CopyToOutputDirectory="PreserveNewest" Link="TestData\%(RecursiveDir)%(Filename)%(Extension)" /> |
15 | </ItemGroup> | 14 | </ItemGroup> |
16 | 15 | ||