diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-26 11:31:05 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-05-11 11:14:01 -0700 |
| commit | df016066100df955d5ff98811e113fb2b1bd4b8a (patch) | |
| tree | a27b35a3651ca7b1d8c4bb7c7483ec2f92583e08 /src/dtf | |
| parent | dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff) | |
| download | wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2 wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip | |
Implement integrated build process
Diffstat (limited to 'src/dtf')
24 files changed, 104 insertions, 433 deletions
diff --git a/src/dtf/CSharp.Build.props b/src/dtf/CSharp.Build.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/dtf/CSharp.Build.props +++ /dev/null | |||
| @@ -1,13 +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 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props | ||
| 4 | then update all of the repos. | ||
| 5 | --> | ||
| 6 | <Project> | ||
| 7 | <PropertyGroup> | ||
| 8 | <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> | ||
| 9 | <SignAssembly>true</SignAssembly> | ||
| 10 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
| 11 | <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass> | ||
| 12 | </PropertyGroup> | ||
| 13 | </Project> | ||
diff --git a/src/dtf/Cpp.Build.props b/src/dtf/Cpp.Build.props deleted file mode 100644 index 44a042c7..00000000 --- a/src/dtf/Cpp.Build.props +++ /dev/null | |||
| @@ -1,104 +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 | <PropertyGroup> | ||
| 6 | <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform> | ||
| 7 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir> | ||
| 8 | <OutDir>$(OutputPath)$(Platform)\</OutDir> | ||
| 9 | </PropertyGroup> | ||
| 10 | |||
| 11 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 12 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 13 | </PropertyGroup> | ||
| 14 | |||
| 15 | <ItemDefinitionGroup> | ||
| 16 | <ClCompile> | ||
| 17 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 18 | <WarningLevel>Level4</WarningLevel> | ||
| 19 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 20 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 21 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 22 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 23 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 24 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 25 | <ExceptionHandling>false</ExceptionHandling> | ||
| 26 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 27 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 28 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 29 | </ClCompile> | ||
| 30 | <ResourceCompile> | ||
| 31 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 32 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 33 | </ResourceCompile> | ||
| 34 | <Lib> | ||
| 35 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 36 | </Lib> | ||
| 37 | <Link> | ||
| 38 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 39 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 40 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 41 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 42 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 43 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 44 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 45 | </Link> | ||
| 46 | </ItemDefinitionGroup> | ||
| 47 | |||
| 48 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 49 | <ClCompile> | ||
| 50 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 51 | </ClCompile> | ||
| 52 | </ItemDefinitionGroup> | ||
| 53 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 54 | <ClCompile> | ||
| 55 | <CallingConvention>CDecl</CallingConvention> | ||
| 56 | </ClCompile> | ||
| 57 | </ItemDefinitionGroup> | ||
| 58 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 59 | <ClCompile> | ||
| 60 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 61 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 62 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 63 | </ClCompile> | ||
| 64 | </ItemDefinitionGroup> | ||
| 65 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 66 | <ClCompile> | ||
| 67 | <Optimization>Disabled</Optimization> | ||
| 68 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 69 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 70 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 71 | </ClCompile> | ||
| 72 | </ItemDefinitionGroup> | ||
| 73 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | ||
| 74 | <ClCompile> | ||
| 75 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 76 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | ||
| 77 | </ClCompile> | ||
| 78 | </ItemDefinitionGroup> | ||
| 79 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 80 | <ClCompile> | ||
| 81 | <Optimization>MinSpace</Optimization> | ||
| 82 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 83 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 84 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 85 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 86 | </ClCompile> | ||
| 87 | <Link> | ||
| 88 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 89 | <OptimizeReferences>true</OptimizeReferences> | ||
| 90 | </Link> | ||
| 91 | </ItemDefinitionGroup> | ||
| 92 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | ||
| 93 | <ClCompile> | ||
| 94 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 95 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | ||
| 96 | </ClCompile> | ||
| 97 | </ItemDefinitionGroup> | ||
| 98 | <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' "> | ||
| 99 | <Link> | ||
| 100 | <KeyFile>$(LinkKeyFile)</KeyFile> | ||
| 101 | <DelaySign>$(LinkDelaySign)</DelaySign> | ||
| 102 | </Link> | ||
| 103 | </ItemDefinitionGroup> | ||
| 104 | </Project> | ||
diff --git a/src/dtf/Custom.Build.props b/src/dtf/Custom.Build.props deleted file mode 100644 index 50429f77..00000000 --- a/src/dtf/Custom.Build.props +++ /dev/null | |||
| @@ -1,20 +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 | <PropertyGroup> | ||
| 6 | <DebugType>embedded</DebugType> | ||
| 7 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 8 | </PropertyGroup> | ||
| 9 | |||
| 10 | <PropertyGroup Condition=" '$(UsingMicrosoftNETSdk)'!='true' and '$(Configuration)' == 'Debug' "> | ||
| 11 | <DebugSymbols>true</DebugSymbols> | ||
| 12 | <Optimize>false</Optimize> | ||
| 13 | <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants> | ||
| 14 | </PropertyGroup> | ||
| 15 | <PropertyGroup Condition=" '$(UsingMicrosoftNETSdk)'!='true' and '$(Configuration)' == 'Release' "> | ||
| 16 | <DebugSymbols>false</DebugSymbols> | ||
| 17 | <Optimize>true</Optimize> | ||
| 18 | <DefineConstants>$(DefineConstants);TRACE</DefineConstants> | ||
| 19 | </PropertyGroup> | ||
| 20 | </Project> | ||
diff --git a/src/dtf/Directory.Build.props b/src/dtf/Directory.Build.props index f83cc154..cc54c88e 100644 --- a/src/dtf/Directory.Build.props +++ b/src/dtf/Directory.Build.props | |||
| @@ -1,29 +1,10 @@ | |||
| 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 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props | ||
| 5 | then update all of the repos. | ||
| 6 | --> | ||
| 7 | <Project> | 4 | <Project> |
| 8 | <PropertyGroup> | 5 | <PropertyGroup> |
| 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 6 | <SegmentName>dtf</SegmentName> |
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | ||
| 11 | <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages> | ||
| 12 | |||
| 13 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | ||
| 14 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | ||
| 15 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | ||
| 16 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | ||
| 17 | |||
| 18 | <Authors>WiX Toolset Team</Authors> | ||
| 19 | <Company>WiX Toolset</Company> | ||
| 20 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | ||
| 21 | <PackageLicenseExpression>MS-RL</PackageLicenseExpression> | ||
| 22 | <Product>WiX Toolset</Product> | ||
| 23 | </PropertyGroup> | 7 | </PropertyGroup> |
| 24 | 8 | ||
| 25 | <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " /> | 9 | <Import Project="..\Directory.Build.props" /> |
| 26 | <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " /> | ||
| 27 | <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " /> | ||
| 28 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 29 | </Project> | 10 | </Project> |
diff --git a/src/dtf/Directory.Build.targets b/src/dtf/Directory.Build.targets deleted file mode 100644 index cb988931..00000000 --- a/src/dtf/Directory.Build.targets +++ /dev/null | |||
| @@ -1,56 +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 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets | ||
| 5 | then update all of the repos. | ||
| 6 | --> | ||
| 7 | <!-- | ||
| 8 | Replace PackageReferences with ProjectReferences when the projects can be found in .sln. | ||
| 9 | See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284 | ||
| 10 | --> | ||
| 11 | <Project> | ||
| 12 | <PropertyGroup> | ||
| 13 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 14 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 15 | </PropertyGroup> | ||
| 16 | |||
| 17 | <PropertyGroup> | ||
| 18 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 19 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 20 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 21 | </PropertyGroup> | ||
| 22 | |||
| 23 | <Choose> | ||
| 24 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 25 | |||
| 26 | <PropertyGroup> | ||
| 27 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 28 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 29 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 30 | </PropertyGroup> | ||
| 31 | |||
| 32 | <ItemGroup> | ||
| 33 | <!-- Keep the identity of the PackageReference --> | ||
| 34 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 35 | <PackageName>%(Identity)</PackageName> | ||
| 36 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 37 | </SmartPackageReference> | ||
| 38 | |||
| 39 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 40 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 41 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 42 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 43 | </PackageInSolution> | ||
| 44 | |||
| 45 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 46 | |||
| 47 | <!-- Remove the package references that are now referenced as projects --> | ||
| 48 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
| 49 | </ItemGroup> | ||
| 50 | |||
| 51 | </When> | ||
| 52 | </Choose> | ||
| 53 | |||
| 54 | <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " /> | ||
| 55 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 56 | </Project> | ||
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 6b2c8cf8..08a88b30 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,9 +18,4 @@ | |||
| 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.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 24 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 25 | </ItemGroup> | ||
| 26 | </Project> | 21 | </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 2f5f2f27..aa97019d 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,9 +13,4 @@ | |||
| 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.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 19 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 20 | </ItemGroup> | ||
| 21 | </Project> | 16 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj index e49a446b..907e7a04 100644 --- a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj +++ b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj | |||
| @@ -13,9 +13,4 @@ | |||
| 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.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 19 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 20 | </ItemGroup> | ||
| 21 | </Project> | 16 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj b/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj index b1b3faa7..1c81b861 100644 --- a/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj +++ b/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj | |||
| @@ -26,10 +26,6 @@ | |||
| 26 | </Content> | 26 | </Content> |
| 27 | </ItemGroup> | 27 | </ItemGroup> |
| 28 | 28 | ||
| 29 | <ItemGroup> | ||
| 30 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 31 | </ItemGroup> | ||
| 32 | |||
| 33 | <PropertyGroup> | 29 | <PropertyGroup> |
| 34 | <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn> | 30 | <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn> |
| 35 | </PropertyGroup> | 31 | </PropertyGroup> |
diff --git a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj index b5f5e9a2..89bff841 100644 --- a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj +++ b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj | |||
| @@ -9,9 +9,4 @@ | |||
| 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.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 15 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 16 | </ItemGroup> | ||
| 17 | </Project> | 12 | </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 b4587071..fbc85880 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,9 +13,4 @@ | |||
| 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.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 19 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 20 | </ItemGroup> | ||
| 21 | </Project> | 16 | </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 28ded687..b3952177 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,9 +15,4 @@ | |||
| 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.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 21 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 22 | </ItemGroup> | ||
| 23 | </Project> | 18 | </Project> |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj index 515e609b..117a4114 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj | |||
| @@ -19,11 +19,6 @@ | |||
| 19 | <None Include="WindowsInstaller.cd" /> | 19 | <None Include="WindowsInstaller.cd" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | 21 | ||
| 22 | <ItemGroup> | ||
| 23 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 24 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 25 | </ItemGroup> | ||
| 26 | |||
| 27 | <ItemGroup Condition=" '$(TargetFramework)'=='net20' "> | 22 | <ItemGroup Condition=" '$(TargetFramework)'=='net20' "> |
| 28 | <Reference Include="System.Configuration" /> | 23 | <Reference Include="System.Configuration" /> |
| 29 | </ItemGroup> | 24 | </ItemGroup> |
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 4c269d55..e215b227 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 | |||
| @@ -1,6 +1,5 @@ | |||
| 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 | |||
| 4 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | 3 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> |
| 5 | <PropertyGroup> | 4 | <PropertyGroup> |
| 6 | <ProjectGuid>{4544158C-2D63-4146-85FF-62169280144E}</ProjectGuid> | 5 | <ProjectGuid>{4544158C-2D63-4146-85FF-62169280144E}</ProjectGuid> |
| @@ -9,6 +8,7 @@ | |||
| 9 | <AssemblyName>WixToolsetTests.Dtf.Cab</AssemblyName> | 8 | <AssemblyName>WixToolsetTests.Dtf.Cab</AssemblyName> |
| 10 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
| 11 | <CreateDocumentation>false</CreateDocumentation> | 10 | <CreateDocumentation>false</CreateDocumentation> |
| 11 | <SignOutput>false</SignOutput> | ||
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| @@ -23,9 +23,18 @@ | |||
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | 24 | ||
| 25 | <ItemGroup> | 25 | <ItemGroup> |
| 26 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> | 26 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> |
| 27 | <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" /> | 27 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> |
| 28 | <ProjectReference Include="..\WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj" /> | 28 | <Name>WixToolset.Dtf.Compression</Name> |
| 29 | </ProjectReference> | ||
| 30 | <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj"> | ||
| 31 | <Project>{E56C0ED3-FA2F-4CA9-A1C0-2E796BB0BF80}</Project> | ||
| 32 | <Name>WixToolset.Dtf.Compression.Cab</Name> | ||
| 33 | </ProjectReference> | ||
| 34 | <ProjectReference Include="..\WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj"> | ||
| 35 | <Project>{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}</Project> | ||
| 36 | <Name>WixToolsetTests.Dtf.Compression</Name> | ||
| 37 | </ProjectReference> | ||
| 29 | </ItemGroup> | 38 | </ItemGroup> |
| 30 | 39 | ||
| 31 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 40 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
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 c65563b6..c9d7007b 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 | |||
| @@ -1,6 +1,5 @@ | |||
| 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 | |||
| 4 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <PropertyGroup> | 4 | <PropertyGroup> |
| 6 | <ProjectGuid>{328799BB-7B03-4B28-8180-4132211FD07D}</ProjectGuid> | 5 | <ProjectGuid>{328799BB-7B03-4B28-8180-4132211FD07D}</ProjectGuid> |
| @@ -9,6 +8,7 @@ | |||
| 9 | <AssemblyName>WixToolsetTests.Dtf.Zip</AssemblyName> | 8 | <AssemblyName>WixToolsetTests.Dtf.Zip</AssemblyName> |
| 10 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
| 11 | <CreateDocumentation>false</CreateDocumentation> | 10 | <CreateDocumentation>false</CreateDocumentation> |
| 11 | <SignOutput>false</SignOutput> | ||
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| @@ -21,9 +21,18 @@ | |||
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | 22 | ||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
| 24 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> | 24 | <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj"> |
| 25 | <ProjectReference Include="..\WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj" /> | 25 | <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project> |
| 26 | <ProjectReference Include="..\WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj" /> | 26 | <Name>WixToolset.Dtf.Compression</Name> |
| 27 | </ProjectReference> | ||
| 28 | <ProjectReference Include="..\WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj"> | ||
| 29 | <Project>{E4C60A57-8AFE-4FF3-9058-ACAC6A069533}</Project> | ||
| 30 | <Name>WixToolset.Dtf.Compression.Zip</Name> | ||
| 31 | </ProjectReference> | ||
| 32 | <ProjectReference Include="..\WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj"> | ||
| 33 | <Project>{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}</Project> | ||
| 34 | <Name>WixToolsetTests.Dtf.Compression</Name> | ||
| 35 | </ProjectReference> | ||
| 27 | </ItemGroup> | 36 | </ItemGroup> |
| 28 | 37 | ||
| 29 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 38 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj index 120779ee..55449ee2 100644 --- a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj +++ b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj | |||
| @@ -1,6 +1,5 @@ | |||
| 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 | |||
| 4 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <PropertyGroup> | 4 | <PropertyGroup> |
| 6 | <ProjectGuid>{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}</ProjectGuid> | 5 | <ProjectGuid>{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}</ProjectGuid> |
| @@ -8,6 +7,7 @@ | |||
| 8 | <RootNamespace>WixToolsetTests.Dtf</RootNamespace> | 7 | <RootNamespace>WixToolsetTests.Dtf</RootNamespace> |
| 9 | <AssemblyName>WixToolsetTests.Dtf.Compression</AssemblyName> | 8 | <AssemblyName>WixToolsetTests.Dtf.Compression</AssemblyName> |
| 10 | <CreateDocumentation>false</CreateDocumentation> | 9 | <CreateDocumentation>false</CreateDocumentation> |
| 10 | <SignOutput>false</SignOutput> | ||
| 11 | </PropertyGroup> | 11 | </PropertyGroup> |
| 12 | 12 | ||
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| @@ -24,7 +24,10 @@ | |||
| 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> | ||
| 29 | <Name>WixToolset.Dtf.Compression</Name> | ||
| 30 | </ProjectReference> | ||
| 28 | </ItemGroup> | 31 | </ItemGroup> |
| 29 | 32 | ||
| 30 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 33 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
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 aadd4592..911568e7 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 | |||
| @@ -1,7 +1,5 @@ | |||
| 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 | |||
| 4 | |||
| 5 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | 3 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> |
| 6 | <PropertyGroup> | 4 | <PropertyGroup> |
| 7 | <ProjectGuid>{137D376B-989F-4FEA-9A67-01D8D38CA0DE}</ProjectGuid> | 5 | <ProjectGuid>{137D376B-989F-4FEA-9A67-01D8D38CA0DE}</ProjectGuid> |
| @@ -10,19 +8,23 @@ | |||
| 10 | <AssemblyName>WixToolsetTests.Dtf.WindowsInstaller.CustomActions</AssemblyName> | 8 | <AssemblyName>WixToolsetTests.Dtf.WindowsInstaller.CustomActions</AssemblyName> |
| 11 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
| 12 | <CreateDocumentation>false</CreateDocumentation> | 10 | <CreateDocumentation>false</CreateDocumentation> |
| 11 | <SignOutput>false</SignOutput> | ||
| 13 | </PropertyGroup> | 12 | </PropertyGroup> |
| 14 | 13 | ||
| 15 | <ItemGroup> | 14 | <ItemGroup> |
| 16 | <Compile Include="CustomActionTest.cs" /> | 15 | <Compile Include="CustomActionTest.cs" /> |
| 17 | </ItemGroup> | 16 | </ItemGroup> |
| 18 | 17 | ||
| 19 | <ItemGroup> | 18 | <ItemGroup> |
| 20 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | 19 | <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> |
| 21 | <Reference Include="System" /> | 20 | <Reference Include="System" /> |
| 22 | <Reference Include="System.Windows.Forms" /> | 21 | <Reference Include="System.Windows.Forms" /> |
| 23 | <Reference Include="$(OutputPath)\WixToolset.Dtf.WindowsInstaller.dll" /> | 22 | <Reference Include="$(OutputPath)\WixToolset.Dtf.WindowsInstaller.dll" /> |
| 24 | <ProjectReference Include="..\WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj" /> | 23 | <ProjectReference Include="..\WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj"> |
| 24 | <Project>{16F5202F-9276-4166-975C-C9654BAF8012}</Project> | ||
| 25 | <Name>WixToolsetTests.Dtf.WindowsInstaller</Name> | ||
| 26 | </ProjectReference> | ||
| 25 | </ItemGroup> | 27 | </ItemGroup> |
| 26 | 28 | ||
| 27 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 29 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
| 28 | </Project> | 30 | </Project> |
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 0dc90860..8584f27a 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 | |||
| @@ -1,6 +1,5 @@ | |||
| 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 | |||
| 4 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | 3 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> |
| 5 | <PropertyGroup> | 4 | <PropertyGroup> |
| 6 | <ProjectGuid>{4F55F9B8-D8B6-41EB-8796-221B4CD98324}</ProjectGuid> | 5 | <ProjectGuid>{4F55F9B8-D8B6-41EB-8796-221B4CD98324}</ProjectGuid> |
| @@ -9,6 +8,7 @@ | |||
| 9 | <AssemblyName>WixToolsetTests.Dtf.Linq</AssemblyName> | 8 | <AssemblyName>WixToolsetTests.Dtf.Linq</AssemblyName> |
| 10 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
| 11 | <CreateDocumentation>false</CreateDocumentation> | 10 | <CreateDocumentation>false</CreateDocumentation> |
| 11 | <SignOutput>false</SignOutput> | ||
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| @@ -22,9 +22,18 @@ | |||
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | 23 | ||
| 24 | <ItemGroup> | 24 | <ItemGroup> |
| 25 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" /> | 25 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj"> |
| 26 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj" /> | 26 | <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project> |
| 27 | <ProjectReference Include="..\WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj" /> | 27 | <Name>WixToolset.Dtf.WindowsInstaller</Name> |
| 28 | </ProjectReference> | ||
| 29 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj"> | ||
| 30 | <Project>{7E66313B-C6D4-4729-8422-4D1474E0E6F7}</Project> | ||
| 31 | <Name>WixToolset.Dtf.WindowsInstaller.Linq</Name> | ||
| 32 | </ProjectReference> | ||
| 33 | <ProjectReference Include="..\WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj"> | ||
| 34 | <Project>{16F5202F-9276-4166-975C-C9654BAF8012}</Project> | ||
| 35 | <Name>WixToolsetTests.Dtf.WindowsInstaller</Name> | ||
| 36 | </ProjectReference> | ||
| 28 | </ItemGroup> | 37 | </ItemGroup> |
| 29 | 38 | ||
| 30 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 39 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj index dbddb682..eb3b9f9c 100644 --- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj | |||
| @@ -1,6 +1,5 @@ | |||
| 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 | |||
| 4 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | 3 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> |
| 5 | <PropertyGroup> | 4 | <PropertyGroup> |
| 6 | <ProjectGuid>{16F5202F-9276-4166-975C-C9654BAF8012}</ProjectGuid> | 5 | <ProjectGuid>{16F5202F-9276-4166-975C-C9654BAF8012}</ProjectGuid> |
| @@ -9,6 +8,7 @@ | |||
| 9 | <AssemblyName>WixToolsetTests.Dtf.WindowsInstaller</AssemblyName> | 8 | <AssemblyName>WixToolsetTests.Dtf.WindowsInstaller</AssemblyName> |
| 10 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | 9 | <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
| 11 | <CreateDocumentation>false</CreateDocumentation> | 10 | <CreateDocumentation>false</CreateDocumentation> |
| 11 | <SignOutput>false</SignOutput> | ||
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| @@ -27,7 +27,10 @@ | |||
| 27 | </ItemGroup> | 27 | </ItemGroup> |
| 28 | 28 | ||
| 29 | <ItemGroup> | 29 | <ItemGroup> |
| 30 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" /> | 30 | <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj"> |
| 31 | <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project> | ||
| 32 | <Name>WixToolset.Dtf.WindowsInstaller</Name> | ||
| 33 | </ProjectReference> | ||
| 31 | </ItemGroup> | 34 | </ItemGroup> |
| 32 | 35 | ||
| 33 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 36 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
diff --git a/src/dtf/appveyor.cmd b/src/dtf/appveyor.cmd deleted file mode 100644 index 6dd50c8a..00000000 --- a/src/dtf/appveyor.cmd +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @set _P=%~dp0build\%_C%\publish | ||
| 5 | |||
| 6 | nuget restore || exit /b | ||
| 7 | |||
| 8 | msbuild -p:Configuration=%_C% || exit /b | ||
| 9 | |||
| 10 | msbuild src\Tools\SfxCA\SfxCA.vcxproj -p:Configuration=%_C% -p:Platform="x64" -p:OutputPath="%_P%\WixToolset.Dtf.MSBuild\tools\\" || exit /b | ||
| 11 | msbuild src\Tools\SfxCA\SfxCA.vcxproj -p:Configuration=%_C% -p:Platform="x86" -p:OutputPath="%_P%\WixToolset.Dtf.MSBuild\tools\\" || exit /b | ||
| 12 | |||
| 13 | msbuild src\Tools\MakeSfxCA\MakeSfxCA.csproj -p:Configuration=%_C% -p:TargetFramework="net461" -p:OutputPath="%_P%\WixToolset.Dtf.MSBuild\tools\net461" || exit /b | ||
| 14 | msbuild src\Tools\MakeSfxCA\MakeSfxCA.csproj -p:Configuration=%_C% -p:TargetFramework="netcoreapp3.1" -p:OutputPath="%_P%\WixToolset.Dtf.MSBuild\tools\netcoreapp3.1" || exit /b | ||
| 15 | |||
| 16 | msbuild src\WixToolset.Dtf.MSBuild\WixToolset.Dtf.MSBuild.csproj -p:Configuration=%_C% -p:OutputPath="%_P%\WixToolset.Dtf.MSBuild" || exit /b | ||
| 17 | msbuild src\WixToolset.Dtf.MSBuild\WixToolset.Dtf.MSBuild.csproj -target:Pack -p:Configuration=%_C% || exit /b | ||
| 18 | |||
| 19 | msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.Compression || exit /b | ||
| 20 | msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.Compression.Cab || exit /b | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.Compression.Zip || exit /b | ||
| 22 | msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.Resources || exit /b | ||
| 23 | msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.WindowsInstaller || exit /b | ||
| 24 | msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.WindowsInstaller.Linq || exit /b | ||
| 25 | msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.WindowsInstaller.Package || exit /b | ||
| 26 | |||
| 27 | @popd | ||
| 28 | @endlocal \ No newline at end of file | ||
diff --git a/src/dtf/appveyor.yml b/src/dtf/appveyor.yml deleted file mode 100644 index 522e5af3..00000000 --- a/src/dtf/appveyor.yml +++ /dev/null | |||
| @@ -1,42 +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 | # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml | ||
| 4 | # then update all of the repos. | ||
| 5 | |||
| 6 | branches: | ||
| 7 | only: | ||
| 8 | - master | ||
| 9 | - develop | ||
| 10 | |||
| 11 | image: Visual Studio 2019 | ||
| 12 | |||
| 13 | version: 0.0.0.{build} | ||
| 14 | configuration: Release | ||
| 15 | |||
| 16 | environment: | ||
| 17 | DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | ||
| 18 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 | ||
| 19 | NUGET_XMLDOC_MODE: skip | ||
| 20 | |||
| 21 | build_script: | ||
| 22 | - appveyor.cmd | ||
| 23 | |||
| 24 | pull_requests: | ||
| 25 | do_not_increment_build_number: true | ||
| 26 | |||
| 27 | nuget: | ||
| 28 | disable_publish_on_pr: true | ||
| 29 | |||
| 30 | skip_branch_with_pr: true | ||
| 31 | skip_tags: true | ||
| 32 | |||
| 33 | artifacts: | ||
| 34 | - path: build\Release\**\*.nupkg | ||
| 35 | name: nuget | ||
| 36 | - path: build\Release\**\*.msi | ||
| 37 | name: msi | ||
| 38 | |||
| 39 | notifications: | ||
| 40 | - provider: Slack | ||
| 41 | incoming_webhook: | ||
| 42 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/dtf/dtf.cmd b/src/dtf/dtf.cmd new file mode 100644 index 00000000..e90a54aa --- /dev/null +++ b/src/dtf/dtf.cmd | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | @set _C=Debug | ||
| 5 | :parse_args | ||
| 6 | @if /i "%1"=="release" set _C=Release& shift | ||
| 7 | @if not "%1"=="" shift & goto parse_args | ||
| 8 | |||
| 9 | @echo Building dtf %_C% | ||
| 10 | |||
| 11 | :: dtf | ||
| 12 | |||
| 13 | nuget restore || exit /b | ||
| 14 | |||
| 15 | msbuild -t:Build -p:Configuration=%_C% || exit /b | ||
| 16 | |||
| 17 | msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression || exit /b | ||
| 18 | msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression.Cab || exit /b | ||
| 19 | msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression.Zip || exit /b | ||
| 20 | msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Resources || exit /b | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller || exit /b | ||
| 22 | msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller.Linq || exit /b | ||
| 23 | msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller.Package || exit /b | ||
| 24 | |||
| 25 | @popd | ||
| 26 | @endlocal | ||
diff --git a/src/dtf/WixToolset.Dtf.sln b/src/dtf/dtf.sln index 7e58ad8d..fbd9452c 100644 --- a/src/dtf/WixToolset.Dtf.sln +++ b/src/dtf/dtf.sln | |||
| @@ -3,45 +3,31 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio 15 | 3 | # Visual Studio 15 |
| 4 | VisualStudioVersion = 15.0.26730.8 | 4 | VisualStudioVersion = 15.0.26730.8 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression", "src\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj", "{2D62850C-9F81-4BE9-BDF3-9379389C8F7B}" | 6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression", "WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj", "{2D62850C-9F81-4BE9-BDF3-9379389C8F7B}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression.Cab", "src\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj", "{15895FD1-DD68-407B-8717-08F6DD14F02C}" | 8 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression.Cab", "WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj", "{15895FD1-DD68-407B-8717-08F6DD14F02C}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression.Zip", "src\WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj", "{261F2857-B521-42A4-A3E0-B5165F225E50}" | 10 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression.Zip", "WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj", "{261F2857-B521-42A4-A3E0-B5165F225E50}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Resources", "src\WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj", "{44931ECB-8D6F-4C12-A872-64E261B6A98E}" | 12 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Resources", "WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj", "{44931ECB-8D6F-4C12-A872-64E261B6A98E}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller", "src\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj", "{24121677-0ED0-41B5-833F-1B9A18E87BF4}" | 14 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller", "WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj", "{24121677-0ED0-41B5-833F-1B9A18E87BF4}" |
| 15 | EndProject | 15 | EndProject |
| 16 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller.Linq", "src\WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj", "{CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}" | 16 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller.Linq", "WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj", "{CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}" |
| 17 | EndProject | 17 | EndProject |
| 18 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller.Package", "src\WixToolset.Dtf.WindowsInstaller.Package\WixToolset.Dtf.WindowsInstaller.Package.csproj", "{1A9940A7-3E29-4428-B753-C4CC66058F1A}" | 18 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller.Package", "WixToolset.Dtf.WindowsInstaller.Package\WixToolset.Dtf.WindowsInstaller.Package.csproj", "{1A9940A7-3E29-4428-B753-C4CC66058F1A}" |
| 19 | EndProject | 19 | EndProject |
| 20 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression", "src\WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj", "{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}" | 20 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression", "WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj", "{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}" |
| 21 | EndProject | 21 | EndProject |
| 22 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Cab", "src\WixToolsetTests.Dtf.Compression.Cab\WixToolsetTests.Dtf.Compression.Cab.csproj", "{4544158C-2D63-4146-85FF-62169280144E}" | 22 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Cab", "WixToolsetTests.Dtf.Compression.Cab\WixToolsetTests.Dtf.Compression.Cab.csproj", "{4544158C-2D63-4146-85FF-62169280144E}" |
| 23 | EndProject | 23 | EndProject |
| 24 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Zip", "src\WixToolsetTests.Dtf.Compression.Zip\WixToolsetTests.Dtf.Compression.Zip.csproj", "{328799BB-7B03-4B28-8180-4132211FD07D}" | 24 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Zip", "WixToolsetTests.Dtf.Compression.Zip\WixToolsetTests.Dtf.Compression.Zip.csproj", "{328799BB-7B03-4B28-8180-4132211FD07D}" |
| 25 | EndProject | 25 | EndProject |
| 26 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller", "src\WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj", "{16F5202F-9276-4166-975C-C9654BAF8012}" | 26 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller", "WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj", "{16F5202F-9276-4166-975C-C9654BAF8012}" |
| 27 | EndProject | 27 | EndProject |
| 28 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.CustomActions", "src\WixToolsetTests.Dtf.WindowsInstaller.CustomActions\WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj", "{137D376B-989F-4FEA-9A67-01D8D38CA0DE}" | 28 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.CustomActions", "WixToolsetTests.Dtf.WindowsInstaller.CustomActions\WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj", "{137D376B-989F-4FEA-9A67-01D8D38CA0DE}" |
| 29 | EndProject | 29 | EndProject |
| 30 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.Linq", "src\WixToolsetTests.Dtf.WindowsInstaller.Linq\WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj", "{4F55F9B8-D8B6-41EB-8796-221B4CD98324}" | 30 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.Linq", "WixToolsetTests.Dtf.WindowsInstaller.Linq\WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj", "{4F55F9B8-D8B6-41EB-8796-221B4CD98324}" |
| 31 | EndProject | ||
| 32 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{A988A768-200F-408F-AE3B-5D9B14AA48EE}" | ||
| 33 | EndProject | ||
| 34 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SfxCA", "src\Tools\SfxCA\SfxCA.vcxproj", "{55D5BA28-D427-4F53-80C2-FE9EF23C1553}" | ||
| 35 | EndProject | ||
| 36 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MakeSfxCA", "src\Tools\MakeSfxCA\MakeSfxCA.csproj", "{3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}" | ||
| 37 | EndProject | ||
| 38 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{4A47EC94-8234-4479-87BC-3D924DB7AA4E}" | ||
| 39 | EndProject | ||
| 40 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedCA", "src\Samples\ManagedCA\ManagedCA.csproj", "{DB9E5F02-8241-440A-9B60-980EB5B42B13}" | ||
| 41 | EndProject | ||
| 42 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddedUI", "src\Samples\EmbeddedUI\EmbeddedUI.csproj", "{864B8C50-7895-4485-AC89-900D86FD8C0D}" | ||
| 43 | EndProject | ||
| 44 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.MSBuild", "src\WixToolset.Dtf.MSBuild\WixToolset.Dtf.MSBuild.csproj", "{E7A00377-A0B5-400F-8337-C0814AAC7153}" | ||
| 45 | EndProject | 31 | EndProject |
| 46 | Global | 32 | Global |
| 47 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 33 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
| @@ -209,50 +195,6 @@ Global | |||
| 209 | {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x64.Build.0 = Release|Any CPU | 195 | {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x64.Build.0 = Release|Any CPU |
| 210 | {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x86.ActiveCfg = Release|Any CPU | 196 | {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x86.ActiveCfg = Release|Any CPU |
| 211 | {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x86.Build.0 = Release|Any CPU | 197 | {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x86.Build.0 = Release|Any CPU |
| 212 | {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 213 | {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Debug|x64.ActiveCfg = Debug|Win32 | ||
| 214 | {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 215 | {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Debug|x86.Build.0 = Debug|Win32 | ||
| 216 | {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 217 | {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Release|x64.ActiveCfg = Release|x64 | ||
| 218 | {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Release|x86.ActiveCfg = Release|Win32 | ||
| 219 | {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Release|x86.Build.0 = Release|Win32 | ||
| 220 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 221 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 222 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 223 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 224 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 225 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 226 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 227 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 228 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 229 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|x64.Build.0 = Release|Any CPU | ||
| 230 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 231 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|x86.Build.0 = Release|Any CPU | ||
| 232 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 233 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 234 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 235 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 236 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 237 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 238 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 239 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 240 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 241 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|x64.Build.0 = Release|Any CPU | ||
| 242 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 243 | {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|x86.Build.0 = Release|Any CPU | ||
| 244 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 245 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 246 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 247 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 248 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 249 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 250 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 251 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 252 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 253 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|x64.Build.0 = Release|Any CPU | ||
| 254 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 255 | {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|x86.Build.0 = Release|Any CPU | ||
| 256 | {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 198 | {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
| 257 | {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|Any CPU.Build.0 = Debug|Any CPU | 199 | {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|Any CPU.Build.0 = Debug|Any CPU |
| 258 | {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x64.ActiveCfg = Debug|Any CPU | 200 | {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x64.ActiveCfg = Debug|Any CPU |
| @@ -270,10 +212,6 @@ Global | |||
| 270 | HideSolutionNode = FALSE | 212 | HideSolutionNode = FALSE |
| 271 | EndGlobalSection | 213 | EndGlobalSection |
| 272 | GlobalSection(NestedProjects) = preSolution | 214 | GlobalSection(NestedProjects) = preSolution |
| 273 | {55D5BA28-D427-4F53-80C2-FE9EF23C1553} = {A988A768-200F-408F-AE3B-5D9B14AA48EE} | ||
| 274 | {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B} = {A988A768-200F-408F-AE3B-5D9B14AA48EE} | ||
| 275 | {DB9E5F02-8241-440A-9B60-980EB5B42B13} = {4A47EC94-8234-4479-87BC-3D924DB7AA4E} | ||
| 276 | {864B8C50-7895-4485-AC89-900D86FD8C0D} = {4A47EC94-8234-4479-87BC-3D924DB7AA4E} | ||
| 277 | EndGlobalSection | 215 | EndGlobalSection |
| 278 | GlobalSection(ExtensibilityGlobals) = postSolution | 216 | GlobalSection(ExtensibilityGlobals) = postSolution |
| 279 | SolutionGuid = {BB57C98D-C0C2-4805-AED3-C19B47759DBD} | 217 | SolutionGuid = {BB57C98D-C0C2-4805-AED3-C19B47759DBD} |
diff --git a/src/dtf/nuget.config b/src/dtf/nuget.config deleted file mode 100644 index 6e1ad9b5..00000000 --- a/src/dtf/nuget.config +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 6 | </packageSources> | ||
| 7 | </configuration> \ No newline at end of file | ||
