diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-22 14:34:24 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-22 14:39:10 +1000 |
| commit | e4f1a4310f09e3777d035f35f4b4ca69d69f5083 (patch) | |
| tree | 844df1d2d8f7815ca3fca3752a704877ad62869f /src/test/examples | |
| parent | 75ec7925bb5276c21c1b948f2162c8afcd47e699 (diff) | |
| download | wix-e4f1a4310f09e3777d035f35f4b4ca69d69f5083.tar.gz wix-e4f1a4310f09e3777d035f35f4b4ca69d69f5083.tar.bz2 wix-e4f1a4310f09e3777d035f35f4b4ca69d69f5083.zip | |
Update dependencies.
Diffstat (limited to 'src/test/examples')
10 files changed, 19 insertions, 75 deletions
diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 1224fa49..7fc831d1 100644 --- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj | |||
| @@ -13,6 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> | 15 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> |
| 16 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.22" /> | 16 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ No newline at end of file |
diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index d08565ff..04f4f9d1 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | |||
| @@ -1,56 +1,20 @@ | |||
| 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 | 3 | ||
| 4 | 4 | <Project Sdk="Microsoft.NET.Sdk"> | |
| 5 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 6 | <Import Project="..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\build\net20\WixToolset.Mba.Core.props" Condition="Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\build\net20\WixToolset.Mba.Core.props')" /> | ||
| 7 | <PropertyGroup> | 5 | <PropertyGroup> |
| 8 | <ProjectGuid>{CC4236FC-226E-4232-AB50-24CBEC4D314D}</ProjectGuid> | 6 | <TargetFramework>net20</TargetFramework> |
| 9 | <AssemblyName>Example.FullFramework2MBA</AssemblyName> | 7 | <AssemblyName>Example.FullFramework2MBA</AssemblyName> |
| 10 | <OutputType>Library</OutputType> | ||
| 11 | <RootNamespace>Example.FullFramework2MBA</RootNamespace> | 8 | <RootNamespace>Example.FullFramework2MBA</RootNamespace> |
| 12 | <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> | 9 | <DebugType>embedded</DebugType> |
| 13 | <CreateDocumentation>false</CreateDocumentation> | 10 | <RuntimeIdentifier>win-x86</RuntimeIdentifier> |
| 14 | </PropertyGroup> | ||
| 15 | <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | ||
| 16 | <DebugSymbols>true</DebugSymbols> | ||
| 17 | <Optimize>false</Optimize> | ||
| 18 | <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants> | ||
| 19 | </PropertyGroup> | ||
| 20 | <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> | ||
| 21 | <DebugSymbols>true</DebugSymbols> | ||
| 22 | <Optimize>true</Optimize> | ||
| 23 | <DefineConstants>$(DefineConstants);TRACE</DefineConstants> | ||
| 24 | </PropertyGroup> | 11 | </PropertyGroup> |
| 25 | <ItemGroup> | 12 | |
| 26 | <Compile Include="FullFramework2BA.cs" /> | ||
| 27 | <Compile Include="FullFramework2BAFactory.cs" /> | ||
| 28 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| 29 | </ItemGroup> | ||
| 30 | <ItemGroup> | 13 | <ItemGroup> |
| 31 | <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" /> | 14 | <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" /> |
| 32 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | |||
| 33 | <ItemGroup> | 17 | <ItemGroup> |
| 34 | <None Include="packages.config" /> | 18 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" /> |
| 35 | </ItemGroup> | ||
| 36 | <ItemGroup> | ||
| 37 | <Reference Include="System" /> | ||
| 38 | <Reference Include="System.Configuration" /> | ||
| 39 | <Reference Include="System.Data" /> | ||
| 40 | <Reference Include="System.Xml" /> | ||
| 41 | <Reference Include="WixToolset.Mba.Core"> | ||
| 42 | <HintPath>..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\lib\net20\WixToolset.Mba.Core.dll</HintPath> | ||
| 43 | </Reference> | ||
| 44 | </ItemGroup> | 19 | </ItemGroup> |
| 45 | |||
| 46 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
| 47 | |||
| 48 | <Import Project="..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> | ||
| 49 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 50 | <PropertyGroup> | ||
| 51 | <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> | ||
| 52 | </PropertyGroup> | ||
| 53 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\build\net20\WixToolset.Mba.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\build\net20\WixToolset.Mba.Core.props'))" /> | ||
| 54 | <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 55 | </Target> | ||
| 56 | </Project> \ No newline at end of file | 20 | </Project> \ No newline at end of file |
diff --git a/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs index 40cff30f..647c2040 100644 --- a/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs +++ b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs | |||
| @@ -1,5 +1,6 @@ | |||
| 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 | [assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))] | ||
| 3 | namespace Example.FullFramework2MBA | 4 | namespace Example.FullFramework2MBA |
| 4 | { | 5 | { |
| 5 | using WixToolset.Mba.Core; | 6 | using WixToolset.Mba.Core; |
diff --git a/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs b/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs deleted file mode 100644 index 640c17ad..00000000 --- a/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 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 | using System; | ||
| 4 | using System.Reflection; | ||
| 5 | using System.Runtime.InteropServices; | ||
| 6 | using WixToolset.Mba.Core; | ||
| 7 | |||
| 8 | [assembly: AssemblyTitle("Example.FullFramework2MBA")] | ||
| 9 | [assembly: AssemblyDescription("Example.FullFramework2MBA")] | ||
| 10 | [assembly: AssemblyProduct("WiX Toolset")] | ||
| 11 | [assembly: AssemblyCompany("WiX Toolset Team")] | ||
| 12 | [assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")] | ||
| 13 | |||
| 14 | // Types should not be visible to COM by default. | ||
| 15 | [assembly: ComVisible(false)] | ||
| 16 | [assembly: Guid("7A671EAF-FAE5-41A2-83DD-C35AB3779651")] | ||
| 17 | |||
| 18 | [assembly: BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))] | ||
diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config deleted file mode 100644 index 1f2a91d9..00000000 --- a/src/test/examples/FullFramework2MBA/packages.config +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="WixToolset.Mba.Core" version="4.0.22" targetFramework="net461" /> | ||
| 4 | </packages> \ No newline at end of file | ||
diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index 51f7090f..2c702a3b 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | |||
| @@ -5,11 +5,12 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net48</TargetFramework> | 6 | <TargetFramework>net48</TargetFramework> |
| 7 | <Description>Full Framework v4 MBA</Description> | 7 | <Description>Full Framework v4 MBA</Description> |
| 8 | <RuntimeIdentifier>win-x86</RuntimeIdentifier> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| 11 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> | 12 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> |
| 12 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.22" PrivateAssets="All" /> | 13 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" PrivateAssets="All" /> |
| 13 | </ItemGroup> | 14 | </ItemGroup> |
| 14 | 15 | ||
| 15 | <ItemGroup> | 16 | <ItemGroup> |
diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index dc013b68..ad599e23 100644 --- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | |||
| @@ -18,6 +18,6 @@ | |||
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> | 20 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> |
| 21 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.22" /> | 21 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" /> |
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | </Project> \ No newline at end of file | 23 | </Project> \ No newline at end of file |
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index ef54389d..b863618a 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj | |||
| @@ -1,9 +1,9 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" /> | 4 | <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" /> |
| 5 | <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" /> |
| 6 | <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" /> | 6 | <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" /> |
| 7 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
| 8 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|Win32"> |
| 9 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
| @@ -68,8 +68,8 @@ | |||
| 68 | <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> | 68 | <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> |
| 69 | </PropertyGroup> | 69 | </PropertyGroup> |
| 70 | <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> | 70 | <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> |
| 71 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props'))" /> | 71 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" /> |
| 72 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" /> | 72 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" /> |
| 73 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" /> | 73 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" /> |
| 74 | </Target> | 74 | </Target> |
| 75 | </Project> \ No newline at end of file | 75 | </Project> \ No newline at end of file |
diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index 1b4c9487..7cbb7bbe 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config | |||
| @@ -2,6 +2,6 @@ | |||
| 2 | <packages> | 2 | <packages> |
| 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> |
| 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" /> |
| 5 | <package id="WixToolset.BalUtil" version="4.0.22" targetFramework="native" /> | 5 | <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" /> |
| 6 | <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" /> | 6 | <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" /> |
| 7 | </packages> \ No newline at end of file | 7 | </packages> \ No newline at end of file |
diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj index 02d400ee..fd03209f 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | |||
| @@ -11,6 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> | 13 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> |
| 14 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.22" /> | 14 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | </Project> \ No newline at end of file | 16 | </Project> \ No newline at end of file |
