diff options
Diffstat (limited to 'src/ext/Bal/test')
16 files changed, 57 insertions, 74 deletions
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index c9ab4219..f00a8eff 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | |||
@@ -5,6 +5,7 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
8 | <SignOutput>false</SignOutput> | ||
8 | </PropertyGroup> | 9 | </PropertyGroup> |
9 | 10 | ||
10 | <ItemGroup> | 11 | <ItemGroup> |
@@ -24,20 +25,12 @@ | |||
24 | </ItemGroup> | 25 | </ItemGroup> |
25 | 26 | ||
26 | <ItemGroup> | 27 | <ItemGroup> |
27 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 28 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
28 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
29 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
30 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
31 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | ||
32 | </ItemGroup> | 29 | </ItemGroup> |
33 | 30 | ||
34 | <ItemGroup> | 31 | <ItemGroup> |
35 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 32 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
36 | </ItemGroup> | 33 | <PackageReference Include="xunit" /> |
37 | 34 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
38 | <ItemGroup> | ||
39 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
40 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
41 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
42 | </ItemGroup> | 35 | </ItemGroup> |
43 | </Project> | 36 | </Project> |
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs index 44538227..9d7fc9db 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs | |||
@@ -10,7 +10,7 @@ namespace WixToolsetTest.ManagedHost | |||
10 | 10 | ||
11 | public class TestEngine | 11 | public class TestEngine |
12 | { | 12 | { |
13 | private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); | 13 | private static readonly string TestEngineFile = TestData.Get(@"..\x86\examples\Example.TestEngine\Example.TestEngine.exe"); |
14 | 14 | ||
15 | public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) | 15 | public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) |
16 | { | 16 | { |
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 38c8926c..16dbec94 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | |||
@@ -4,22 +4,21 @@ | |||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
7 | <IsPackable>false</IsPackable> | ||
8 | <SignOutput>false</SignOutput> | ||
7 | </PropertyGroup> | 9 | </PropertyGroup> |
8 | 10 | ||
9 | <ItemGroup> | 11 | <ItemGroup> |
10 | <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" /> | 12 | <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" ReferenceOutputAssembly="false" /> |
11 | </ItemGroup> | 13 | </ItemGroup> |
12 | 14 | ||
13 | <ItemGroup> | 15 | <ItemGroup> |
14 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 16 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
15 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
16 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
17 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
18 | </ItemGroup> | 17 | </ItemGroup> |
19 | 18 | ||
20 | <ItemGroup> | 19 | <ItemGroup> |
21 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | 20 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
22 | <PackageReference Include="xunit" Version="2.4.1" /> | 21 | <PackageReference Include="xunit" /> |
23 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 22 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
24 | </ItemGroup> | 23 | </ItemGroup> |
25 | </Project> | 24 | </Project> |
diff --git a/src/ext/Bal/test/examples/Directory.Build.props b/src/ext/Bal/test/examples/Directory.Build.props index 3d5870a5..52b931f6 100644 --- a/src/ext/Bal/test/examples/Directory.Build.props +++ b/src/ext/Bal/test/examples/Directory.Build.props | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 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. --> | 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 | <Project> | 3 | <Project> |
4 | <Import Project="..\..\Directory.Build.props" /> | 4 | <Import Project="$(MsbuildThisFileDirectory)..\..\Directory.Build.props" /> |
5 | <Import Project="Wix.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " /> | 5 | <Import Project="Wix.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " /> |
6 | </Project> | 6 | </Project> |
diff --git a/src/ext/Bal/test/examples/Directory.Build.targets b/src/ext/Bal/test/examples/Directory.Build.targets index 6dcf402b..35946585 100644 --- a/src/ext/Bal/test/examples/Directory.Build.targets +++ b/src/ext/Bal/test/examples/Directory.Build.targets | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 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. --> | 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 | <Project> | 3 | <Project> |
4 | <Import Project="..\..\Directory.Build.targets" /> | 4 | <Import Project="$(MsbuildThisFileDirectory)..\..\..\..\Directory.Build.targets" /> |
5 | <Import Project="Wix.Build.targets" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " /> | 5 | <Import Project="Wix.Build.targets" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " /> |
6 | </Project> | 6 | </Project> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs index d146845c..d7b06f6a 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs | |||
@@ -3,7 +3,6 @@ | |||
3 | <BootstrapperApplication> | 3 | <BootstrapperApplication> |
4 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.deps.json" Name="Example.EarliestCoreMBA.deps.json" /> | 4 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.deps.json" Name="Example.EarliestCoreMBA.deps.json" /> |
5 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> | 5 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> |
6 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.pdb" Name="Example.EarliestCoreMBA.pdb" /> | ||
7 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" /> |
8 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> |
9 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index cb66c138..8069df45 100644 --- a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj | |||
@@ -12,7 +12,6 @@ | |||
12 | </ItemGroup> | 12 | </ItemGroup> |
13 | 13 | ||
14 | <ItemGroup> | 14 | <ItemGroup> |
15 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 15 | <PackageReference Include="WixToolset.Mba.Core" /> |
16 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" /> | ||
17 | </ItemGroup> | 16 | </ItemGroup> |
18 | </Project> \ No newline at end of file | 17 | </Project> |
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 21079ed1..7e0e4881 100644 --- a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | |||
@@ -15,6 +15,11 @@ | |||
15 | </ItemGroup> | 15 | </ItemGroup> |
16 | 16 | ||
17 | <ItemGroup> | 17 | <ItemGroup> |
18 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" /> | 18 | <PackageReference Include="WixToolset.Mba.Core" /> |
19 | </ItemGroup> | 19 | </ItemGroup> |
20 | </Project> \ No newline at end of file | 20 | |
21 | <ItemGroup> | ||
22 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
23 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
24 | </ItemGroup> | ||
25 | </Project> | ||
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index a05e7888..ae0d4cc8 100644 --- a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | |||
@@ -9,11 +9,10 @@ | |||
9 | </PropertyGroup> | 9 | </PropertyGroup> |
10 | 10 | ||
11 | <ItemGroup> | 11 | <ItemGroup> |
12 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 12 | <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" /> |
13 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" PrivateAssets="All" /> | ||
14 | </ItemGroup> | 13 | </ItemGroup> |
15 | 14 | ||
16 | <ItemGroup> | 15 | <ItemGroup> |
17 | <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" /> | 16 | <PackageReference Include="WixToolset.Mba.Core" /> |
18 | </ItemGroup> | 17 | </ItemGroup> |
19 | </Project> \ No newline at end of file | 18 | </Project> |
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs index d5b543e8..c569442a 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs | |||
@@ -3,7 +3,6 @@ | |||
3 | <BootstrapperApplication> | 3 | <BootstrapperApplication> |
4 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.deps.json" Name="Example.LatestCoreMBA.deps.json" /> | 4 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.deps.json" Name="Example.LatestCoreMBA.deps.json" /> |
5 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> | 5 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> |
6 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.pdb" Name="Example.LatestCoreMBA.pdb" /> | ||
7 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" /> |
8 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> |
9 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> |
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index 9f3f02d9..aad56a3e 100644 --- a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | |||
@@ -15,7 +15,6 @@ | |||
15 | </ItemGroup> | 15 | </ItemGroup> |
16 | 16 | ||
17 | <ItemGroup> | 17 | <ItemGroup> |
18 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 18 | <PackageReference Include="WixToolset.Mba.Core" /> |
19 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" /> | ||
20 | </ItemGroup> | 19 | </ItemGroup> |
21 | </Project> \ No newline at end of file | 20 | </Project> |
diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj index 99eb917e..39207d77 100644 --- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj | |||
@@ -1,9 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 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. --> | 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | |
4 | <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" /> | 4 | <Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
5 | <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
6 | <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
7 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
8 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
9 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
@@ -30,6 +28,7 @@ | |||
30 | <Platform>x64</Platform> | 28 | <Platform>x64</Platform> |
31 | </ProjectConfiguration> | 29 | </ProjectConfiguration> |
32 | </ItemGroup> | 30 | </ItemGroup> |
31 | |||
33 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
34 | <ProjectGuid>{3D44B67D-A475-49BA-8310-E39F6C117CC9}</ProjectGuid> | 33 | <ProjectGuid>{3D44B67D-A475-49BA-8310-E39F6C117CC9}</ProjectGuid> |
35 | <ConfigurationType>Application</ConfigurationType> | 34 | <ConfigurationType>Application</ConfigurationType> |
@@ -39,17 +38,10 @@ | |||
39 | <CharacterSet>Unicode</CharacterSet> | 38 | <CharacterSet>Unicode</CharacterSet> |
40 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | 39 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> |
41 | </PropertyGroup> | 40 | </PropertyGroup> |
41 | |||
42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
44 | <ImportGroup Label="ExtensionSettings"> | 44 | |
45 | </ImportGroup> | ||
46 | <ImportGroup Label="Shared"> | ||
47 | <Import Project="..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
48 | </ImportGroup> | ||
49 | <PropertyGroup> | ||
50 | <ProjectAdditionalLinkLibraries> | ||
51 | </ProjectAdditionalLinkLibraries> | ||
52 | </PropertyGroup> | ||
53 | <ItemGroup> | 45 | <ItemGroup> |
54 | <ClCompile Include="precomp.cpp"> | 46 | <ClCompile Include="precomp.cpp"> |
55 | <PrecompiledHeader>Create</PrecompiledHeader> | 47 | <PrecompiledHeader>Create</PrecompiledHeader> |
@@ -60,6 +52,7 @@ | |||
60 | <ClCompile Include="TestEngine.cpp" /> | 52 | <ClCompile Include="TestEngine.cpp" /> |
61 | <ClCompile Include="WaitForQuitEngine.cpp" /> | 53 | <ClCompile Include="WaitForQuitEngine.cpp" /> |
62 | </ItemGroup> | 54 | </ItemGroup> |
55 | |||
63 | <ItemGroup> | 56 | <ItemGroup> |
64 | <ClInclude Include="precomp.h" /> | 57 | <ClInclude Include="precomp.h" /> |
65 | <ClInclude Include="ReloadEngine.h" /> | 58 | <ClInclude Include="ReloadEngine.h" /> |
@@ -67,17 +60,15 @@ | |||
67 | <ClInclude Include="TestEngine.h" /> | 60 | <ClInclude Include="TestEngine.h" /> |
68 | <ClInclude Include="WaitForQuitEngine.h" /> | 61 | <ClInclude Include="WaitForQuitEngine.h" /> |
69 | </ItemGroup> | 62 | </ItemGroup> |
63 | |||
70 | <ItemGroup> | 64 | <ItemGroup> |
71 | <None Include="packages.config" /> | 65 | <PackageReference Include="WixToolset.Dutil" /> |
66 | <PackageReference Include="WixToolset.BalUtil" /> | ||
67 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
68 | |||
69 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
70 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
72 | </ItemGroup> | 71 | </ItemGroup> |
72 | |||
73 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 73 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
74 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 74 | </Project> |
75 | <PropertyGroup> | ||
76 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | ||
77 | </PropertyGroup> | ||
78 | <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
79 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props'))" /> | ||
80 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
81 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
82 | </Target> | ||
83 | </Project> \ No newline at end of file | ||
diff --git a/src/ext/Bal/test/examples/TestEngine/packages.config b/src/ext/Bal/test/examples/TestEngine/packages.config deleted file mode 100644 index 548ddb48..00000000 --- a/src/ext/Bal/test/examples/TestEngine/packages.config +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <packages> | ||
3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
5 | <package id="WixToolset.BalUtil" version="4.0.58" targetFramework="native" /> | ||
6 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
7 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs index 68d742b0..aa2bdeb2 100644 --- a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs | |||
@@ -3,7 +3,6 @@ | |||
3 | <BootstrapperApplication> | 3 | <BootstrapperApplication> |
4 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.deps.json" Name="Example.WPFCoreMBA.deps.json" /> | 4 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.deps.json" Name="Example.WPFCoreMBA.deps.json" /> |
5 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll" Name="Example.WPFCoreMBA.dll" bal:BAFactoryAssembly="yes" /> | 5 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll" Name="Example.WPFCoreMBA.dll" bal:BAFactoryAssembly="yes" /> |
6 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.pdb" Name="Example.WPFCoreMBA.pdb" /> | ||
7 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json" Name="Example.WPFCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json" Name="Example.WPFCoreMBA.runtimeconfig.json" /> |
8 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> |
9 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> |
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj index 296e5be9..3d63e7b9 100644 --- a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | |||
@@ -8,9 +8,17 @@ | |||
8 | <UseWPF>true</UseWPF> | 8 | <UseWPF>true</UseWPF> |
9 | </PropertyGroup> | 9 | </PropertyGroup> |
10 | 10 | ||
11 | |||
12 | <ItemGroup> | 11 | <ItemGroup> |
13 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 12 | <PackageReference Include="WixToolset.Mba.Core" /> |
14 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" /> | ||
15 | </ItemGroup> | 13 | </ItemGroup> |
16 | </Project> \ No newline at end of file | 14 | |
15 | <Target Name="GitVersion"> | ||
16 | <PropertyGroup> | ||
17 | <GitBaseVersionMajor>42</GitBaseVersionMajor> | ||
18 | <GitBaseVersionMinor>42</GitBaseVersionMinor> | ||
19 | <GitBaseVersionPatch>42</GitBaseVersionPatch> | ||
20 | <GitCommits>42</GitCommits> | ||
21 | <GitSha>abc123def456</GitSha> | ||
22 | </PropertyGroup> | ||
23 | </Target> | ||
24 | </Project> | ||
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj index 08cb7511..5722cfcb 100644 --- a/src/ext/Bal/test/examples/examples.proj +++ b/src/ext/Bal/test/examples/examples.proj | |||
@@ -46,5 +46,5 @@ | |||
46 | <MSBuild Projects="%(ExampleBundleProject.Identity)" /> | 46 | <MSBuild Projects="%(ExampleBundleProject.Identity)" /> |
47 | </Target> | 47 | </Target> |
48 | 48 | ||
49 | <Import Project="..\..\Directory.Build.targets" /> | 49 | <Import Project="..\..\..\..\Directory.Build.targets" /> |
50 | </Project> \ No newline at end of file | 50 | </Project> \ No newline at end of file |