diff options
| author | Bob Arnson <bob@firegiant.com> | 2021-12-05 21:16:28 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2021-12-25 20:31:10 -0500 |
| commit | 667ee81ee0263314b4546f5598efc66fe84c08b7 (patch) | |
| tree | cfc2077743411a93d0e3c0d2ef637ef9bbdb655e /src/dtf | |
| parent | b9c712f26d921f7ffe0509d1cc45456680e8139f (diff) | |
| download | wix-667ee81ee0263314b4546f5598efc66fe84c08b7.tar.gz wix-667ee81ee0263314b4546f5598efc66fe84c08b7.tar.bz2 wix-667ee81ee0263314b4546f5598efc66fe84c08b7.zip | |
Build with VS2022, which is now required.
- Use VS2022/v143 libraries exclusively. C++ compatibility works.
Diffstat (limited to 'src/dtf')
13 files changed, 74 insertions, 22 deletions
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj index 08a88b30..bacfd90c 100644 --- a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj +++ b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj | |||
| @@ -18,4 +18,8 @@ | |||
| 18 | <ItemGroup> | 18 | <ItemGroup> |
| 19 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> | 19 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | |||
| 22 | <ItemGroup> | ||
| 23 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 24 | </ItemGroup> | ||
| 21 | </Project> | 25 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj index aa97019d..476b63b0 100644 --- a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj +++ b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj | |||
| @@ -13,4 +13,8 @@ | |||
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> | 14 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | |||
| 17 | <ItemGroup> | ||
| 18 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 19 | </ItemGroup> | ||
| 16 | </Project> | 20 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj index 907e7a04..c3d36d29 100644 --- a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj +++ b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj | |||
| @@ -13,4 +13,8 @@ | |||
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <None Include="Compression.cd" /> | 14 | <None Include="Compression.cd" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | |||
| 17 | <ItemGroup> | ||
| 18 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 19 | </ItemGroup> | ||
| 16 | </Project> | 20 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj index 89bff841..411457a6 100644 --- a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj +++ b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj | |||
| @@ -9,4 +9,8 @@ | |||
| 9 | <Description>Classes for reading and writing resource data in executable files</Description> | 9 | <Description>Classes for reading and writing resource data in executable files</Description> |
| 10 | <CreateDocumentationFile>true</CreateDocumentationFile> | 10 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 11 | </PropertyGroup> | 11 | </PropertyGroup> |
| 12 | |||
| 13 | <ItemGroup> | ||
| 14 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 15 | </ItemGroup> | ||
| 12 | </Project> | 16 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj index fbc85880..7aa376bb 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj | |||
| @@ -13,4 +13,8 @@ | |||
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" /> | 14 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | |||
| 17 | <ItemGroup> | ||
| 18 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 19 | </ItemGroup> | ||
| 16 | </Project> | 20 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj index b3952177..9e0b1a40 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj | |||
| @@ -15,4 +15,8 @@ | |||
| 15 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> | 15 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> |
| 16 | <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" /> | 16 | <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | |||
| 19 | <ItemGroup> | ||
| 20 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 21 | </ItemGroup> | ||
| 18 | </Project> | 22 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj index 117a4114..324a7eed 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj | |||
| @@ -22,4 +22,8 @@ | |||
| 22 | <ItemGroup Condition=" '$(TargetFramework)'=='net20' "> | 22 | <ItemGroup Condition=" '$(TargetFramework)'=='net20' "> |
| 23 | <Reference Include="System.Configuration" /> | 23 | <Reference Include="System.Configuration" /> |
| 24 | </ItemGroup> | 24 | </ItemGroup> |
| 25 | |||
| 26 | <ItemGroup> | ||
| 27 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 28 | </ItemGroup> | ||
| 25 | </Project> | 29 | </Project> |
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj index ddcf68ac..9cd09e12 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj | |||
| @@ -11,18 +11,18 @@ | |||
| 11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <Compile Include="CabTest.cs" /> | 16 | <Compile Include="CabTest.cs" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <Reference Include="System" /> | 20 | <Reference Include="System" /> |
| 21 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 21 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 22 | <Reference Include="System.Data" /> | 22 | <Reference Include="System.Data" /> |
| 23 | <Reference Include="System.Xml" /> | 23 | <Reference Include="System.Xml" /> |
| 24 | </ItemGroup> | 24 | </ItemGroup> |
| 25 | 25 | ||
| 26 | <ItemGroup> | 26 | <ItemGroup> |
| 27 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> | 27 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> |
| 28 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> | 28 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> |
| @@ -38,5 +38,9 @@ | |||
| 38 | </ProjectReference> | 38 | </ProjectReference> |
| 39 | </ItemGroup> | 39 | </ItemGroup> |
| 40 | 40 | ||
| 41 | <ItemGroup> | ||
| 42 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 43 | </ItemGroup> | ||
| 44 | |||
| 41 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 45 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 42 | </Project> | 46 | </Project> \ No newline at end of file |
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj index 3e7fcb7e..4c7e48dc 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj | |||
| @@ -11,16 +11,16 @@ | |||
| 11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <Compile Include="ZipTest.cs" /> | 16 | <Compile Include="ZipTest.cs" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 20 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 21 | <Reference Include="System" /> | 21 | <Reference Include="System" /> |
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | 23 | ||
| 24 | <ItemGroup> | 24 | <ItemGroup> |
| 25 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> | 25 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> |
| 26 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> | 26 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> |
| @@ -36,5 +36,9 @@ | |||
| 36 | </ProjectReference> | 36 | </ProjectReference> |
| 37 | </ItemGroup> | 37 | </ItemGroup> |
| 38 | 38 | ||
| 39 | <ItemGroup> | ||
| 40 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 41 | </ItemGroup> | ||
| 42 | |||
| 39 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 43 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 40 | </Project> | 44 | </Project> \ No newline at end of file |
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj index 83040938..9ca24363 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj | |||
| @@ -10,20 +10,20 @@ | |||
| 10 | <SignOutput>false</SignOutput> | 10 | <SignOutput>false</SignOutput> |
| 11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 11 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <Compile Include="CompressionTestUtil.cs" /> | 15 | <Compile Include="CompressionTestUtil.cs" /> |
| 16 | <Compile Include="MisbehavingStreamContext.cs" /> | 16 | <Compile Include="MisbehavingStreamContext.cs" /> |
| 17 | <Compile Include="OptionStreamContext.cs" /> | 17 | <Compile Include="OptionStreamContext.cs" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | 19 | ||
| 20 | <ItemGroup> | 20 | <ItemGroup> |
| 21 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 21 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 22 | <Reference Include="System" /> | 22 | <Reference Include="System" /> |
| 23 | <Reference Include="System.Data" /> | 23 | <Reference Include="System.Data" /> |
| 24 | <Reference Include="System.Xml" /> | 24 | <Reference Include="System.Xml" /> |
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | 26 | ||
| 27 | <ItemGroup> | 27 | <ItemGroup> |
| 28 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> | 28 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> |
| 29 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> | 29 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> |
| @@ -31,5 +31,9 @@ | |||
| 31 | </ProjectReference> | 31 | </ProjectReference> |
| 32 | </ItemGroup> | 32 | </ItemGroup> |
| 33 | 33 | ||
| 34 | <ItemGroup> | ||
| 35 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 36 | </ItemGroup> | ||
| 37 | |||
| 34 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 38 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 35 | </Project> | 39 | </Project> \ No newline at end of file |
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj index 6a053026..aa3389d9 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <Compile Include="CustomActionTest.cs" /> | 16 | <Compile Include="CustomActionTest.cs" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| @@ -26,6 +26,10 @@ | |||
| 26 | <Name>WixToolsetTests.Dtf.WindowsInstaller</Name> | 26 | <Name>WixToolsetTests.Dtf.WindowsInstaller</Name> |
| 27 | </ProjectReference> | 27 | </ProjectReference> |
| 28 | </ItemGroup> | 28 | </ItemGroup> |
| 29 | |||
| 30 | <ItemGroup> | ||
| 31 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 32 | </ItemGroup> | ||
| 29 | 33 | ||
| 30 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 34 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 31 | </Project> | 35 | </Project> \ No newline at end of file |
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj index e7fbf28d..db3923aa 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj | |||
| @@ -11,17 +11,17 @@ | |||
| 11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <Compile Include="LinqTest.cs" /> | 16 | <Compile Include="LinqTest.cs" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 20 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 21 | <Reference Include="System" /> | 21 | <Reference Include="System" /> |
| 22 | <Reference Include="System.Core" /> | 22 | <Reference Include="System.Core" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | 24 | ||
| 25 | <ItemGroup> | 25 | <ItemGroup> |
| 26 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj"> | 26 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj"> |
| 27 | <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project> | 27 | <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project> |
| @@ -37,5 +37,9 @@ | |||
| 37 | </ProjectReference> | 37 | </ProjectReference> |
| 38 | </ItemGroup> | 38 | </ItemGroup> |
| 39 | 39 | ||
| 40 | <ItemGroup> | ||
| 41 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 42 | </ItemGroup> | ||
| 43 | |||
| 40 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 44 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 41 | </Project> | 45 | </Project> \ No newline at end of file |
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj index 1fedfe4e..d9aeae3b 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <SignOutput>false</SignOutput> | 11 | <SignOutput>false</SignOutput> |
| 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <Compile Include="EmbeddedExternalUI.cs" /> | 16 | <Compile Include="EmbeddedExternalUI.cs" /> |
| 17 | <Compile Include="Schema.cs" /> | 17 | <Compile Include="Schema.cs" /> |
| @@ -19,14 +19,14 @@ | |||
| 19 | <Compile Include="WindowsInstallerTransactions.cs" /> | 19 | <Compile Include="WindowsInstallerTransactions.cs" /> |
| 20 | <Compile Include="WindowsInstallerUtils.cs" /> | 20 | <Compile Include="WindowsInstallerUtils.cs" /> |
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | 22 | ||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
| 24 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 24 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 25 | <Reference Include="System" /> | 25 | <Reference Include="System" /> |
| 26 | <Reference Include="System.Windows.Forms" /> | 26 | <Reference Include="System.Windows.Forms" /> |
| 27 | <Reference Include="System.Xml" /> | 27 | <Reference Include="System.Xml" /> |
| 28 | </ItemGroup> | 28 | </ItemGroup> |
| 29 | 29 | ||
| 30 | <ItemGroup> | 30 | <ItemGroup> |
| 31 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj"> | 31 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj"> |
| 32 | <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project> | 32 | <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project> |
| @@ -34,5 +34,9 @@ | |||
| 34 | </ProjectReference> | 34 | </ProjectReference> |
| 35 | </ItemGroup> | 35 | </ItemGroup> |
| 36 | 36 | ||
| 37 | <ItemGroup> | ||
| 38 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> | ||
| 39 | </ItemGroup> | ||
| 40 | |||
| 37 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 41 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 38 | </Project> | 42 | </Project> \ No newline at end of file |
