diff options
599 files changed, 3312 insertions, 9397 deletions
| @@ -386,3 +386,16 @@ FodyWeavers.xsd | |||
| 386 | # JetBrains Rider | 386 | # JetBrains Rider |
| 387 | .idea/ | 387 | .idea/ |
| 388 | *.sln.iml | 388 | *.sln.iml |
| 389 | |||
| 390 | |||
| 391 | # WiX Specific Ignores | ||
| 392 | |||
| 393 | # Ignore global.json and Directory.Package.props since they are generated | ||
| 394 | src/global.json | ||
| 395 | src/Directory.Packages.props | ||
| 396 | |||
| 397 | # Ignore downloaded tools | ||
| 398 | build/.tools/ | ||
| 399 | |||
| 400 | # Ignore generated test data | ||
| 401 | src/test/burn/TestData/CacheTests/BundleC/fivegb.file | ||
diff --git a/src/api/burn/appveyor.yml b/appveyor.yml index e4d25586..6f7d7b1b 100644 --- a/src/api/burn/appveyor.yml +++ b/appveyor.yml | |||
| @@ -1,7 +1,4 @@ | |||
| 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 | # | ||
| 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 | 2 | ||
| 6 | branches: | 3 | branches: |
| 7 | only: | 4 | only: |
| @@ -17,9 +14,13 @@ environment: | |||
| 17 | DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | 14 | DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true |
| 18 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 | 15 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 |
| 19 | NUGET_XMLDOC_MODE: skip | 16 | NUGET_XMLDOC_MODE: skip |
| 17 | SigningUser: | ||
| 18 | secure: s+b2kuhi/AlE8ZYFsNVHFLfgJOwi0fIKMCOP+xL++8U= | ||
| 19 | SigningSecret: | ||
| 20 | secure: h0urCGu3+ArelfLcW0JvB82rc7dkPqedVSxXmMbQ+dc= | ||
| 20 | 21 | ||
| 21 | build_script: | 22 | build_script: |
| 22 | - appveyor.cmd | 23 | - src\build_official.cmd |
| 23 | 24 | ||
| 24 | test: off | 25 | test: off |
| 25 | 26 | ||
| @@ -33,8 +34,9 @@ skip_branch_with_pr: true | |||
| 33 | skip_tags: true | 34 | skip_tags: true |
| 34 | 35 | ||
| 35 | artifacts: | 36 | artifacts: |
| 36 | - path: build\Release\**\*.nupkg | 37 | - path: build\artifacts |
| 37 | name: nuget | 38 | name: artifacts |
| 39 | type: zip | ||
| 38 | 40 | ||
| 39 | notifications: | 41 | notifications: |
| 40 | - provider: Slack | 42 | - provider: Slack |
diff --git a/build.cmd b/build.cmd new file mode 100644 index 00000000..63fe7d6d --- /dev/null +++ b/build.cmd | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | @echo off | ||
| 2 | |||
| 3 | setlocal | ||
| 4 | pushd %~dp0 | ||
| 5 | |||
| 6 | if /i "%1"=="release" set _C=Release | ||
| 7 | |||
| 8 | src\build_all.cmd %_C% | ||
| 9 | |||
| 10 | popd | ||
| 11 | endlocal | ||
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index dc78f888..983b4d66 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
| @@ -1,16 +1,19 @@ | |||
| 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 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | 7 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> |
| 8 | <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> | ||
| 11 | 9 | ||
| 12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | 10 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> |
| 13 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | 11 | <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</RootBuildFolder> |
| 12 | <RootPackagesFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\packages\))</RootPackagesFolder> | ||
| 13 | <ArtifactsFolder>$(RootBuildFolder)artifacts\</ArtifactsFolder> | ||
| 14 | <ToolsFolder>$(RootBuildFolder).tools</ToolsFolder> | ||
| 15 | <PackageOutputPath>$(ArtifactsFolder)</PackageOutputPath> | ||
| 16 | <BaseOutputPath>$(RootBuildFolder)$(SegmentName)\</BaseOutputPath> | ||
| 14 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | 17 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> |
| 15 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | 18 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> |
| 16 | 19 | ||
| @@ -22,9 +25,9 @@ | |||
| 22 | 25 | ||
| 23 | <GitThisAssembly>false</GitThisAssembly> | 26 | <GitThisAssembly>false</GitThisAssembly> |
| 24 | <GitVersionFile>version.txt</GitVersionFile> | 27 | <GitVersionFile>version.txt</GitVersionFile> |
| 28 | <GitInfoReportImportance>low</GitInfoReportImportance> | ||
| 25 | <GitBaseVersionRegex Condition="'$(GitBaseVersionRegex)' == ''">v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>(\d+|{[\dA-za-z\-\.]+}))(?:\-(?<LABEL>[\dA-Za-z\-\.{}]+))?$|^v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>(\d+|{[\dA-za-z\-\.]+}))\.(?<PATCH>\d+|{[\dA-za-z\-\.]+})(?:\-(?<LABEL>[\dA-Za-z\-\.{}]+))?$|^(?<LABEL>[\dA-Za-z\-\.{}]+)\-v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>\d+|{[\dA-za-z\-\.]+})\.(?<PATCH>\d+|{[\dA-za-z\-\.]+})$</GitBaseVersionRegex> | 29 | <GitBaseVersionRegex Condition="'$(GitBaseVersionRegex)' == ''">v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>(\d+|{[\dA-za-z\-\.]+}))(?:\-(?<LABEL>[\dA-Za-z\-\.{}]+))?$|^v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>(\d+|{[\dA-za-z\-\.]+}))\.(?<PATCH>\d+|{[\dA-za-z\-\.]+})(?:\-(?<LABEL>[\dA-Za-z\-\.{}]+))?$|^(?<LABEL>[\dA-Za-z\-\.{}]+)\-v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>\d+|{[\dA-za-z\-\.]+})\.(?<PATCH>\d+|{[\dA-za-z\-\.]+})$</GitBaseVersionRegex> |
| 26 | </PropertyGroup> | 30 | </PropertyGroup> |
| 27 | 31 | ||
| 28 | <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | 32 | <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> |
| 29 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 30 | </Project> | 33 | </Project> |
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index c426f25e..11ebc2e0 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets | |||
| @@ -1,12 +1,14 @@ | |||
| 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.targets | ||
| 5 | then update all of the repos. | ||
| 6 | --> | ||
| 7 | <Project> | 4 | <Project> |
| 5 | <!-- <ItemGroup> | ||
| 6 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 7 | <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" /> | ||
| 8 | </ItemGroup> --> | ||
| 9 | |||
| 8 | <PropertyGroup> | 10 | <PropertyGroup> |
| 9 | <SigningToolFolder>$(BaseOutputPath)obj\.tools</SigningToolFolder> | 11 | <SigningToolFolder>$(ToolsFolder)</SigningToolFolder> |
| 10 | <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe> | 12 | <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe> |
| 11 | <SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist> | 13 | <SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist> |
| 12 | <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration> | 14 | <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration> |
| @@ -20,11 +22,19 @@ | |||
| 20 | </PropertyGroup> | 22 | </PropertyGroup> |
| 21 | </Target> | 23 | </Target> |
| 22 | 24 | ||
| 23 | <Target Name="__SetPropertiesFromGit" DependsOnTargets="GitVersion"> | 25 | <PropertyGroup> |
| 26 | <GetPackageVersionDependsOn> | ||
| 27 | $(GetPackageVersionDependsOn); | ||
| 28 | __SetPropertiesFromGit; | ||
| 29 | </GetPackageVersionDependsOn> | ||
| 30 | </PropertyGroup> | ||
| 31 | |||
| 32 | <Target Name="__SetPropertiesFromGit" DependsOnTargets="GitVersion" Condition=" '$(GitInfoImported)'=='true' "> | ||
| 24 | <PropertyGroup> | 33 | <PropertyGroup> |
| 25 | <AssemblyVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0</AssemblyVersion> | 34 | <AssemblyVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0</AssemblyVersion> |
| 26 | <FileVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits)</FileVersion> | 35 | <FileVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits)</FileVersion> |
| 27 | <PackageVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)</PackageVersion> | 36 | <PackageVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)</PackageVersion> |
| 37 | <Version>$(PackageVersion)</Version> | ||
| 28 | <InformationalVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(GitSha)</InformationalVersion> | 38 | <InformationalVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(GitSha)</InformationalVersion> |
| 29 | <!-- We already included the $(GitSha) in the informational version so do not include it again. --> | 39 | <!-- We already included the $(GitSha) in the informational version so do not include it again. --> |
| 30 | <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion> | 40 | <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion> |
| @@ -42,6 +52,7 @@ | |||
| 42 | <PropertyGroup> | 52 | <PropertyGroup> |
| 43 | <GenerateNuspecDependsOn> | 53 | <GenerateNuspecDependsOn> |
| 44 | $(GenerateNuspecDependsOn); | 54 | $(GenerateNuspecDependsOn); |
| 55 | __SetPropertiesFromGit; | ||
| 45 | __SetNuspecProperties | 56 | __SetNuspecProperties |
| 46 | </GenerateNuspecDependsOn> | 57 | </GenerateNuspecDependsOn> |
| 47 | </PropertyGroup> | 58 | </PropertyGroup> |
| @@ -51,10 +62,14 @@ | |||
| 51 | <PropertyGroup> | 62 | <PropertyGroup> |
| 52 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(GitRepositoryUrl)'!='' ">$(GitRepositoryUrl.Replace('.git',''))</ProjectUrl> | 63 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(GitRepositoryUrl)'!='' ">$(GitRepositoryUrl.Replace('.git',''))</ProjectUrl> |
| 53 | 64 | ||
| 54 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | 65 | <NuspecFile Condition=" '$(NuspecFile)'=='' ">$(MSBuildProjectName).nuspec</NuspecFile> |
| 55 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$([System.IO.Path]::GetFullPath($(OutputPath)..))\</NuspecBasePath> | 66 | <PackageId Condition=" '$(PackageId)'=='' ">$(MSBuildProjectName)</PackageId> |
| 56 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors="$(Authors)";Configuration=$(Configuration);Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"</NuspecProperties> | 67 | <Title Condition=" '$(Title)'=='' ">$(Description)</Title> |
| 57 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(GitSha);RepositoryType=git;RepositoryUrl=$(GitRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | 68 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)</NuspecBasePath> |
| 69 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Version=$(PackageVersion);Authors=$(Authors);Configuration=$(Configuration)</NuspecProperties> | ||
| 70 | <NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 71 | <NuspecProperties>$(NuspecProperties);RepositoryType=git;RepositoryCommit=$(GitSha);RepositoryUrl=$(GitRepositoryUrl)</NuspecProperties> | ||
| 72 | <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory)</NuspecProperties> | ||
| 58 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 73 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 59 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | 74 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> |
| 60 | </PropertyGroup> | 75 | </PropertyGroup> |
| @@ -69,12 +84,14 @@ | |||
| 69 | 84 | ||
| 70 | <Target Name="PackNative" DependsOnTargets="__SetNuspecProperties" | 85 | <Target Name="PackNative" DependsOnTargets="__SetNuspecProperties" |
| 71 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | 86 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> |
| 87 | <Error Text="There must be package reference to 'GitInfo'. Ensure the project was restored as well." | ||
| 88 | Condition=" '$(GitInfoImported)'!='true' " /> | ||
| 72 | 89 | ||
| 73 | <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(BaseOutputPath)$(Configuration)" -BasePath "$(NuspecBasePath)" -Properties $(NuspecProperties)' | 90 | <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(PackageOutputPath.Trim("\"))" -BasePath $(NuspecBasePath) -Properties "$(NuspecProperties)"' |
| 74 | WorkingDirectory="$(MSBuildProjectDirectory)" /> | 91 | WorkingDirectory="$(MSBuildProjectDirectory)" /> |
| 75 | 92 | ||
| 76 | <ItemGroup> | 93 | <ItemGroup> |
| 77 | <NuGetPackOutput Include="$(BaseOutputPath)$(Configuration)\**\$(PackageId)*.nupkg" /> | 94 | <NuGetPackOutput Include="$(PackageOutputPath)\$(PackageId).$(PackageVersion).nupkg" /> |
| 78 | </ItemGroup> | 95 | </ItemGroup> |
| 79 | </Target> | 96 | </Target> |
| 80 | 97 | ||
diff --git a/src/Directory.csproj.props b/src/Directory.csproj.props index 81d24ad1..ef0070ed 100644 --- a/src/Directory.csproj.props +++ b/src/Directory.csproj.props | |||
| @@ -1,13 +1,12 @@ | |||
| 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 | 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> | 3 | <Project> |
| 7 | <PropertyGroup> | 4 | <PropertyGroup> |
| 8 | <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> | 5 | <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> |
| 9 | <SignAssembly>true</SignAssembly> | 6 | <SignAssembly>true</SignAssembly> |
| 10 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | 7 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> |
| 11 | <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass> | 8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> |
| 9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 10 | <DebugType Condition=" '$(DebugType)'=='' ">embedded</DebugType> | ||
| 12 | </PropertyGroup> | 11 | </PropertyGroup> |
| 13 | </Project> | 12 | </Project> |
diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets index 49303a1d..c9927fd7 100644 --- a/src/Directory.csproj.targets +++ b/src/Directory.csproj.targets | |||
| @@ -10,4 +10,9 @@ | |||
| 10 | </PropertyGroup> | 10 | </PropertyGroup> |
| 11 | 11 | ||
| 12 | <Target Name="__SetAssemblyInfoFromGit" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="GetAssemblyVersion" /> | 12 | <Target Name="__SetAssemblyInfoFromGit" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="GetAssemblyVersion" /> |
| 13 | |||
| 14 | <ItemGroup> | ||
| 15 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 16 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 17 | </ItemGroup> | ||
| 13 | </Project> | 18 | </Project> |
diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props index 63d73b36..d150cc2e 100644 --- a/src/Directory.vcxproj.props +++ b/src/Directory.vcxproj.props | |||
| @@ -4,13 +4,13 @@ | |||
| 4 | <Project> | 4 | <Project> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform> | 6 | <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform> |
| 7 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir> | 7 | <PlatformFolder Condition=" '$(Platform)' == 'Win32' ">x86</PlatformFolder> |
| 8 | <OutDir>$(OutputPath)$(Platform)\</OutDir> | 8 | <PlatformFolder Condition=" '$(PlatformFolder)' == '' ">$(Platform)</PlatformFolder> |
| 9 | 9 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformFolder)\</IntDir> | |
| 10 | <!-- NBGV properties --> | 10 | <OutDir>$(OutputPath)$(PlatformFolder)\</OutDir> |
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | 11 | </PropertyGroup> |
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | 12 | ||
| 13 | <PropertyGroup Condition=" '$(CLRSupport)'!='true' "> | ||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> |
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> |
| 16 | </PropertyGroup> | 16 | </PropertyGroup> |
diff --git a/src/Directory.vcxproj.targets b/src/Directory.vcxproj.targets index 9f0689d5..4f278fa6 100644 --- a/src/Directory.vcxproj.targets +++ b/src/Directory.vcxproj.targets | |||
| @@ -11,7 +11,8 @@ | |||
| 11 | </PrepareForBuildDependsOn> | 11 | </PrepareForBuildDependsOn> |
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <Target Name="__SetVersionResource" DependsOnTargets="__SetPropertiesFromGit"> | 14 | <Target Name="__SetVersionResource" DependsOnTargets="__SetPropertiesFromGit" |
| 15 | Condition=" '$(GitInfoImported)'=='true' and ('$(ConfigurationType)'=='Application' or '$(ConfigurationType)'=='DynamicLibrary') "> | ||
| 15 | <PropertyGroup> | 16 | <PropertyGroup> |
| 16 | <_ResourceFileType Condition=" '$(ConfigurationType)'=='Application' ">VFT_APP</_ResourceFileType> | 17 | <_ResourceFileType Condition=" '$(ConfigurationType)'=='Application' ">VFT_APP</_ResourceFileType> |
| 17 | <_ResourceFileType Condition=" '$(ConfigurationType)'=='DynamicLibrary' ">VFT_DLL</_ResourceFileType> | 18 | <_ResourceFileType Condition=" '$(ConfigurationType)'=='DynamicLibrary' ">VFT_DLL</_ResourceFileType> |
diff --git a/src/api/burn/NativeMultiTargeting.Build.props b/src/NativeMultiTargeting.Build.props index 1ff46559..1ff46559 100644 --- a/src/api/burn/NativeMultiTargeting.Build.props +++ b/src/NativeMultiTargeting.Build.props | |||
diff --git a/src/api/wix/Custom.Build.props b/src/api/Directory.Build.props index 889fb62e..9b11624c 100644 --- a/src/api/wix/Custom.Build.props +++ b/src/api/Directory.Build.props | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 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 | <!-- 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 | |||
| 2 | <Project> | 4 | <Project> |
| 3 | <PropertyGroup Condition="'$(Configuration)'=='Release'"> | 5 | <PropertyGroup> |
| 4 | <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | 6 | <SegmentName>api</SegmentName> |
| 5 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | |||
| 9 | <Import Project="..\Directory.Build.props" /> | ||
| 6 | </Project> | 10 | </Project> |
diff --git a/src/api/api.cmd b/src/api/api.cmd new file mode 100644 index 00000000..e08c10aa --- /dev/null +++ b/src/api/api.cmd | |||
| @@ -0,0 +1,43 @@ | |||
| 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 api %_C% | ||
| 10 | |||
| 11 | :: burn | ||
| 12 | |||
| 13 | nuget restore burn\api_burn.sln || exit /b | ||
| 14 | |||
| 15 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 burn\api_burn.sln || exit /b | ||
| 16 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 burn\api_burn.sln || exit /b | ||
| 17 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 burn\api_burn.sln || exit /b | ||
| 18 | |||
| 19 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 burn\api_burn.sln || exit /b | ||
| 20 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 burn\api_burn.sln || exit /b | ||
| 21 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 burn\api_burn.sln || exit /b | ||
| 22 | |||
| 23 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 burn\api_burn.sln || exit /b | ||
| 24 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 burn\api_burn.sln || exit /b | ||
| 25 | |||
| 26 | dotnet test -c %_C% --no-build burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b | ||
| 27 | |||
| 28 | msbuild -t:PackNative -p:Configuration=%_C% burn\balutil\balutil.vcxproj || exit /b | ||
| 29 | msbuild -t:PackNative -p:Configuration=%_C% burn\bextutil\bextutil.vcxproj || exit /b | ||
| 30 | msbuild -t:PackNative -Restore -p:Configuration=%_C% burn\WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj || exit /b | ||
| 31 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b | ||
| 32 | |||
| 33 | |||
| 34 | :: wix | ||
| 35 | |||
| 36 | msbuild -Restore -p:Configuration=%_C% wix\api_wix.sln || exit /b | ||
| 37 | |||
| 38 | dotnet test -c %_C% --no-build wix\api_wix.sln || exit /b | ||
| 39 | |||
| 40 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wix\api_wix.sln || exit /b | ||
| 41 | |||
| 42 | @popd | ||
| 43 | @endlocal | ||
diff --git a/src/api/api.sln b/src/api/api.sln new file mode 100644 index 00000000..4bec2ec3 --- /dev/null +++ b/src/api/api.sln | |||
| @@ -0,0 +1,208 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 16 | ||
| 4 | VisualStudioVersion = 16.6.30114.105 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "wix\WixToolset.Data\WixToolset.Data.csproj", "{6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}" | ||
| 7 | EndProject | ||
| 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Extensibility", "wix\WixToolset.Extensibility\WixToolset.Extensibility.csproj", "{0B5A9161-EDBB-4B60-AE97-24199BCF36A4}" | ||
| 9 | EndProject | ||
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Data", "wix\test\WixToolsetTest.Data\WixToolsetTest.Data.csproj", "{D6A57B9F-CF8C-442B-A9CE-F05258AB0046}" | ||
| 11 | EndProject | ||
| 12 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wix", "wix", "{A2DB791A-F5A8-44F9-9225-2C8BE1936356}" | ||
| 13 | EndProject | ||
| 14 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "burn", "burn", "{E5E93B46-D1AD-4F00-B3C2-F459DC670302}" | ||
| 15 | EndProject | ||
| 16 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "burn\balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}" | ||
| 17 | EndProject | ||
| 18 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "burn\bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}" | ||
| 19 | EndProject | ||
| 20 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "burn\mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}" | ||
| 21 | EndProject | ||
| 22 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "burn\test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}" | ||
| 23 | EndProject | ||
| 24 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "burn\test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}" | ||
| 25 | EndProject | ||
| 26 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{17DA3E92-40C5-4328-9BA5-1FE459A13719}" | ||
| 27 | EndProject | ||
| 28 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{47029283-43EC-4F22-9417-A02B28594912}" | ||
| 29 | EndProject | ||
| 30 | Global | ||
| 31 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 32 | Debug|Any CPU = Debug|Any CPU | ||
| 33 | Debug|ARM64 = Debug|ARM64 | ||
| 34 | Debug|x64 = Debug|x64 | ||
| 35 | Debug|x86 = Debug|x86 | ||
| 36 | Release|Any CPU = Release|Any CPU | ||
| 37 | Release|ARM64 = Release|ARM64 | ||
| 38 | Release|x64 = Release|x64 | ||
| 39 | Release|x86 = Release|x86 | ||
| 40 | EndGlobalSection | ||
| 41 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 42 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 43 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 44 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 45 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 46 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 47 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 48 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 49 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 50 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 51 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 52 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 53 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 54 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 55 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x64.Build.0 = Release|Any CPU | ||
| 56 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 57 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x86.Build.0 = Release|Any CPU | ||
| 58 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 59 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 60 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 61 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 62 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 63 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 64 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 65 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 66 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 67 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 68 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 69 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 70 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 71 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x64.Build.0 = Release|Any CPU | ||
| 72 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 73 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x86.Build.0 = Release|Any CPU | ||
| 74 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 75 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 76 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 77 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 78 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 79 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 80 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 81 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 82 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 83 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 84 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 85 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 86 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 87 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x64.Build.0 = Release|Any CPU | ||
| 88 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 89 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x86.Build.0 = Release|Any CPU | ||
| 90 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 91 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
| 92 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
| 93 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
| 94 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 95 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.Build.0 = Debug|x64 | ||
| 96 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 97 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.Build.0 = Debug|Win32 | ||
| 98 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 99 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
| 100 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.Build.0 = Release|ARM64 | ||
| 101 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.ActiveCfg = Release|x64 | ||
| 102 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.Build.0 = Release|x64 | ||
| 103 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.ActiveCfg = Release|Win32 | ||
| 104 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.Build.0 = Release|Win32 | ||
| 105 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 106 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
| 107 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
| 108 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
| 109 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 110 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.Build.0 = Debug|x64 | ||
| 111 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 112 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.Build.0 = Debug|Win32 | ||
| 113 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 114 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
| 115 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.Build.0 = Release|ARM64 | ||
| 116 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.ActiveCfg = Release|x64 | ||
| 117 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.Build.0 = Release|x64 | ||
| 118 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.ActiveCfg = Release|Win32 | ||
| 119 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.Build.0 = Release|Win32 | ||
| 120 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 121 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
| 122 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
| 123 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
| 124 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 125 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.Build.0 = Debug|x64 | ||
| 126 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 127 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.Build.0 = Debug|Win32 | ||
| 128 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 129 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
| 130 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.Build.0 = Release|ARM64 | ||
| 131 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.ActiveCfg = Release|x64 | ||
| 132 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.Build.0 = Release|x64 | ||
| 133 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.ActiveCfg = Release|Win32 | ||
| 134 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.Build.0 = Release|Win32 | ||
| 135 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 136 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
| 137 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|ARM64.ActiveCfg = Debug|Win32 | ||
| 138 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x64.ActiveCfg = Debug|Win32 | ||
| 139 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 140 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x86.Build.0 = Debug|Win32 | ||
| 141 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 142 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|ARM64.ActiveCfg = Release|Win32 | ||
| 143 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x64.ActiveCfg = Release|Win32 | ||
| 144 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x86.ActiveCfg = Release|Win32 | ||
| 145 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x86.Build.0 = Release|Win32 | ||
| 146 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 147 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
| 148 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|ARM64.ActiveCfg = Debug|Win32 | ||
| 149 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|x64.ActiveCfg = Debug|Win32 | ||
| 150 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 151 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|x86.Build.0 = Debug|Win32 | ||
| 152 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 153 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|ARM64.ActiveCfg = Release|Win32 | ||
| 154 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|x64.ActiveCfg = Release|Win32 | ||
| 155 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|x86.ActiveCfg = Release|Win32 | ||
| 156 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|x86.Build.0 = Release|Win32 | ||
| 157 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 158 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 159 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 160 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 161 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 162 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 163 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 164 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 165 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 166 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 167 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 168 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 169 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 170 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x64.Build.0 = Release|Any CPU | ||
| 171 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 172 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x86.Build.0 = Release|Any CPU | ||
| 173 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 174 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 175 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 176 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 177 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 178 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 179 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 180 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 181 | {47029283-43EC-4F22-9417-A02B28594912}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 182 | {47029283-43EC-4F22-9417-A02B28594912}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 183 | {47029283-43EC-4F22-9417-A02B28594912}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 184 | {47029283-43EC-4F22-9417-A02B28594912}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 185 | {47029283-43EC-4F22-9417-A02B28594912}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 186 | {47029283-43EC-4F22-9417-A02B28594912}.Release|x64.Build.0 = Release|Any CPU | ||
| 187 | {47029283-43EC-4F22-9417-A02B28594912}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 188 | {47029283-43EC-4F22-9417-A02B28594912}.Release|x86.Build.0 = Release|Any CPU | ||
| 189 | EndGlobalSection | ||
| 190 | GlobalSection(SolutionProperties) = preSolution | ||
| 191 | HideSolutionNode = FALSE | ||
| 192 | EndGlobalSection | ||
| 193 | GlobalSection(NestedProjects) = preSolution | ||
| 194 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60} = {A2DB791A-F5A8-44F9-9225-2C8BE1936356} | ||
| 195 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4} = {A2DB791A-F5A8-44F9-9225-2C8BE1936356} | ||
| 196 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046} = {A2DB791A-F5A8-44F9-9225-2C8BE1936356} | ||
| 197 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
| 198 | {06027492-1CB9-48BC-B31E-C1F9356ED07E} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
| 199 | {665E0441-17F9-4105-B202-EDF274657F6E} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
| 200 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
| 201 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
| 202 | {17DA3E92-40C5-4328-9BA5-1FE459A13719} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
| 203 | {47029283-43EC-4F22-9417-A02B28594912} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
| 204 | EndGlobalSection | ||
| 205 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 206 | SolutionGuid = {43BCDC9F-5870-4B64-8363-FF28585020ED} | ||
| 207 | EndGlobalSection | ||
| 208 | EndGlobal | ||
diff --git a/src/api/burn/Directory.Build.props b/src/api/burn/Directory.Build.props deleted file mode 100644 index fb34d54e..00000000 --- a/src/api/burn/Directory.Build.props +++ /dev/null | |||
| @@ -1,26 +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.props | ||
| 5 | then update all of the repos. | ||
| 6 | --> | ||
| 7 | <Project> | ||
| 8 | <PropertyGroup> | ||
| 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | ||
| 11 | |||
| 12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | ||
| 13 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | ||
| 14 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | ||
| 15 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | ||
| 16 | |||
| 17 | <Authors>WiX Toolset Team</Authors> | ||
| 18 | <Company>WiX Toolset</Company> | ||
| 19 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | ||
| 20 | <PackageLicenseExpression>MS-RL</PackageLicenseExpression> | ||
| 21 | <Product>WiX Toolset</Product> | ||
| 22 | </PropertyGroup> | ||
| 23 | |||
| 24 | <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | ||
| 25 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 26 | </Project> | ||
diff --git a/src/api/burn/Directory.Build.targets b/src/api/burn/Directory.Build.targets deleted file mode 100644 index 44701fb6..00000000 --- a/src/api/burn/Directory.Build.targets +++ /dev/null | |||
| @@ -1,73 +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 | <Project> | ||
| 8 | <PropertyGroup> | ||
| 9 | <SigningToolFolder>$(BaseOutputPath)obj\.tools</SigningToolFolder> | ||
| 10 | <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe> | ||
| 11 | <SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist> | ||
| 12 | <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration> | ||
| 13 | </PropertyGroup> | ||
| 14 | |||
| 15 | <PropertyGroup> | ||
| 16 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 17 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 18 | </PropertyGroup> | ||
| 19 | |||
| 20 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 21 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 22 | <PropertyGroup> | ||
| 23 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 24 | |||
| 25 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 26 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(MSBuildProjectDirectory)</NuspecBasePath> | ||
| 27 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors="$(Authors)";Configuration=$(Configuration);Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"</NuspecProperties> | ||
| 28 | <NuspecProperties>$(NuspecProperties);Version=$(NPMPackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 29 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 30 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 31 | </PropertyGroup> | ||
| 32 | </Target> | ||
| 33 | |||
| 34 | <Target Name="PackNative" DependsOnTargets="GetBuildVersion;SetNuspecProperties" | ||
| 35 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 36 | |||
| 37 | <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(BaseOutputPath)$(Configuration)" -BasePath "$(NuspecBasePath)" -Properties $(NuspecProperties)' | ||
| 38 | WorkingDirectory="$(MSBuildProjectDirectory)" /> | ||
| 39 | |||
| 40 | <ItemGroup> | ||
| 41 | <NuGetPackOutput Include="$(BaseOutputPath)$(Configuration)\**\$(PackageId)*.nupkg" /> | ||
| 42 | </ItemGroup> | ||
| 43 | </Target> | ||
| 44 | |||
| 45 | <Target Name="_GetSignClient" | ||
| 46 | Condition=" !Exists('$(SigningToolExe)') "> | ||
| 47 | |||
| 48 | <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' /> | ||
| 49 | |||
| 50 | <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' /> | ||
| 51 | </Target> | ||
| 52 | |||
| 53 | <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild" | ||
| 54 | Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and | ||
| 55 | ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))"> | ||
| 56 | |||
| 57 | <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | ||
| 58 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
| 59 | </Target> | ||
| 60 | |||
| 61 | <Target Name="SignNupkg" DependsOnTargets="_GetSignClient" AfterTargets="Pack;PackNative" | ||
| 62 | Condition=" '$(SigningUser)'!='' and '@(NuGetPackOutput)'!='' and '$(SignNupkg)'!='false' "> | ||
| 63 | <ItemGroup> | ||
| 64 | <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " /> | ||
| 65 | </ItemGroup> | ||
| 66 | |||
| 67 | <Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->'%(Identity)')" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | ||
| 68 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
| 69 | </Target> | ||
| 70 | |||
| 71 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 72 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 73 | </Project> | ||
diff --git a/src/api/burn/Directory.csproj.props b/src/api/burn/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/api/burn/Directory.csproj.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/api/burn/Directory.vcxproj.props b/src/api/burn/Directory.vcxproj.props deleted file mode 100644 index 9ea7071b..00000000 --- a/src/api/burn/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,115 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <PropertyGroup> | ||
| 23 | <CodeAnalysisRuleSet Condition=" Exists('$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset') ">$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> | ||
| 24 | </PropertyGroup> | ||
| 25 | |||
| 26 | <ItemDefinitionGroup> | ||
| 27 | <ClCompile> | ||
| 28 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 29 | <WarningLevel>Level4</WarningLevel> | ||
| 30 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 31 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 32 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 33 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 34 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 35 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 36 | <ExceptionHandling>false</ExceptionHandling> | ||
| 37 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 38 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 39 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 40 | </ClCompile> | ||
| 41 | <ResourceCompile> | ||
| 42 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 43 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 44 | </ResourceCompile> | ||
| 45 | <Lib> | ||
| 46 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 47 | </Lib> | ||
| 48 | <Link> | ||
| 49 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 50 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 51 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 52 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 53 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 54 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 55 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 56 | </Link> | ||
| 57 | </ItemDefinitionGroup> | ||
| 58 | |||
| 59 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 60 | <ClCompile> | ||
| 61 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 62 | </ClCompile> | ||
| 63 | </ItemDefinitionGroup> | ||
| 64 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 65 | <ClCompile> | ||
| 66 | <CallingConvention>CDecl</CallingConvention> | ||
| 67 | </ClCompile> | ||
| 68 | </ItemDefinitionGroup> | ||
| 69 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 70 | <ClCompile> | ||
| 71 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 72 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 73 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 74 | </ClCompile> | ||
| 75 | </ItemDefinitionGroup> | ||
| 76 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 77 | <ClCompile> | ||
| 78 | <Optimization>Disabled</Optimization> | ||
| 79 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 80 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 81 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 82 | </ClCompile> | ||
| 83 | </ItemDefinitionGroup> | ||
| 84 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | ||
| 85 | <ClCompile> | ||
| 86 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 87 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | ||
| 88 | </ClCompile> | ||
| 89 | </ItemDefinitionGroup> | ||
| 90 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 91 | <ClCompile> | ||
| 92 | <Optimization>MinSpace</Optimization> | ||
| 93 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 94 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 95 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 96 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 97 | </ClCompile> | ||
| 98 | <Link> | ||
| 99 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 100 | <OptimizeReferences>true</OptimizeReferences> | ||
| 101 | </Link> | ||
| 102 | </ItemDefinitionGroup> | ||
| 103 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | ||
| 104 | <ClCompile> | ||
| 105 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 106 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | ||
| 107 | </ClCompile> | ||
| 108 | </ItemDefinitionGroup> | ||
| 109 | <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' "> | ||
| 110 | <Link> | ||
| 111 | <KeyFile>$(LinkKeyFile)</KeyFile> | ||
| 112 | <DelaySign>$(LinkDelaySign)</DelaySign> | ||
| 113 | </Link> | ||
| 114 | </ItemDefinitionGroup> | ||
| 115 | </Project> | ||
diff --git a/src/api/burn/README.md b/src/api/burn/README.md deleted file mode 100644 index 380bbda3..00000000 --- a/src/api/burn/README.md +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | # balutil | ||
| 2 | balutil.lib - WiX Toolset Bootstrapper Application Layer native utility library | ||
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec index b10b75d2..d86bb3cd 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec | |||
| @@ -1,19 +1,20 @@ | |||
| 1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
| 2 | <package > | 2 | <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> |
| 3 | <metadata> | 3 | <metadata minClientVersion="4.0"> |
| 4 | <id>$id$</id> | 4 | <id>$id$</id> |
| 5 | <version>$version$</version> | 5 | <version>$version$</version> |
| 6 | <authors>WiX Toolset Team</authors> | 6 | <title>$title$</title> |
| 7 | <owners>WiX Toolset Team</owners> | 7 | <description>$description$</description> |
| 8 | <authors>$authors$</authors> | ||
| 8 | <license type="expression">MS-RL</license> | 9 | <license type="expression">MS-RL</license> |
| 9 | <projectUrl>https://github.com/wixtoolset/BootstrapperCore</projectUrl> | ||
| 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
| 11 | <description>$description$</description> | ||
| 12 | <copyright>$copyright$</copyright> | 11 | <copyright>$copyright$</copyright> |
| 12 | <projectUrl>$projectUrl$</projectUrl> | ||
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
| 13 | </metadata> | 14 | </metadata> |
| 14 | 15 | ||
| 15 | <files> | 16 | <files> |
| 16 | <file src="build\$id$.props" target="build\" /> | 17 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
| 17 | <file src="inc\*" target="build\native\include" /> | 18 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
| 18 | </files> | 19 | </files> |
| 19 | </package> | 20 | </package> |
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj index 0899bdcf..0bd374c7 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj | |||
| @@ -1,19 +1,19 @@ | |||
| 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.Build.NoTargets/3.0.4"> | |
| 5 | <Project ToolsVersion="4.0" DefaultTargets="Pack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 6 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| 7 | <PackageId>WixToolset.BootstrapperCore.Native</PackageId> | 7 | <PackageId>WixToolset.BootstrapperCore.Native</PackageId> |
| 8 | <Description>WiX Bootstrapper native interfaces</Description> | 8 | <Description>WiX Bootstrapper native interfaces</Description> |
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <Target Name="PackNative" DependsOnTargets="GetBuildVersion"> | 11 | <ItemGroup> |
| 12 | <Exec Command='nuget pack $(PackageId).nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Id=$(PackageId);Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)"' /> | 12 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 13 | </Target> | 13 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
| 14 | 14 | </ItemGroup> | |
| 15 | <Import Project="..\Directory.Build.props" /> | ||
| 16 | <!-- <Import Project="..\Directory.Build.targets" /> --> | ||
| 17 | 15 | ||
| 18 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | 16 | <Target Name="Pack" |
| 17 | DependsOnTargets="GitVersion;PackNative" | ||
| 18 | BeforeTargets="AfterBuild" /> | ||
| 19 | </Project> | 19 | </Project> |
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj index 2bd7ca80..ce8c7105 100644 --- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj +++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj | |||
| @@ -13,47 +13,16 @@ | |||
| 13 | <CreateDocumentationFile>true</CreateDocumentationFile> | 13 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 14 | </PropertyGroup> | 14 | </PropertyGroup> |
| 15 | 15 | ||
| 16 | <ItemGroup> | 16 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
| 17 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 17 | <ProjectReference Include="..\mbanative\mbanative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=x86" /> |
| 18 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 19 | </ItemGroup> | 18 | </ItemGroup> |
| 20 | 19 | ||
| 21 | <PropertyGroup> | 20 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
| 22 | <NuspecBasePath>$(OutputPath)</NuspecBasePath> | 21 | <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" /> |
| 23 | <NativeFileListPath Condition=" '$(NCrunch)'=='' ">$(MSBuildProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath> | 22 | <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" /> |
| 24 | <NativeFileListPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath> | 23 | </ItemGroup> |
| 25 | </PropertyGroup> | 24 | <ItemGroup Condition=" '$(NCrunch)'=='1' "> |
| 26 | 25 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" /> | |
| 27 | <Target Name="BuildMbaNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' "> | 26 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" /> |
| 28 | <MSBuild Projects="..\mbanative\mbanative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup"> | 27 | </ItemGroup> |
| 29 | <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" /> | ||
| 30 | </MSBuild> | ||
| 31 | |||
| 32 | <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" /> | ||
| 33 | |||
| 34 | <ItemGroup> | ||
| 35 | <FileWrites Include="$(NativeFileListPath)" /> | ||
| 36 | |||
| 37 | <AllItemsFullPathWithTargetPath Include="@(_NativeProjectOutput->'%(FullPath)')"> | ||
| 38 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 39 | <TargetPath>%(Filename)%(Extension)</TargetPath> | ||
| 40 | </AllItemsFullPathWithTargetPath> | ||
| 41 | </ItemGroup> | ||
| 42 | </Target> | ||
| 43 | |||
| 44 | <Target Name="NCrunchCopyNative" AfterTargets="AfterBuild" Condition=" '$(NCrunch)'=='1' "> | ||
| 45 | <ReadLinesFromFile File="$(NativeFileListPath)"> | ||
| 46 | <Output TaskParameter="Lines" ItemName="_NCrunchNativeProjectOutput" /> | ||
| 47 | </ReadLinesFromFile> | ||
| 48 | |||
| 49 | <Error Text="You must build $(MSBuildProjectName) to create the referenced native projects. Once built, 'Reload and rebuild' the project in the NCrunch Tests. The $(NativeFileListPath) file must not be empty." Condition=" '@(_NCrunchNativeProjectOutput)'=='' " /> | ||
| 50 | |||
| 51 | <Copy SourceFiles="@(_NCrunchNativeProjectOutput)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true"> | ||
| 52 | <Output TaskParameter="CopiedFiles" ItemName="_NCrunchNativeCopied" /> | ||
| 53 | </Copy> | ||
| 54 | |||
| 55 | <ItemGroup> | ||
| 56 | <FileWrites Include="@(_NCrunchNativeCopied)" /> | ||
| 57 | </ItemGroup> | ||
| 58 | </Target> | ||
| 59 | </Project> | 28 | </Project> |
diff --git a/src/api/burn/balutil.sln b/src/api/burn/api_burn.sln index cae580f3..858272fb 100644 --- a/src/api/burn/balutil.sln +++ b/src/api/burn/api_burn.sln | |||
| @@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.29503.13 | 4 | VisualStudioVersion = 16.0.29503.13 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "src\balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "src\bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}" | 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "src\mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}" | 12 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}" | 14 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}" |
| 15 | EndProject | 15 | EndProject |
| 16 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "src\test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}" | 16 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}" |
| 17 | EndProject | 17 | EndProject |
| 18 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "src\test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}" | 18 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}" |
| 19 | EndProject | 19 | EndProject |
| 20 | Global | 20 | Global |
| 21 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 21 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/api/burn/appveyor.cmd b/src/api/burn/appveyor.cmd deleted file mode 100644 index 26f75243..00000000 --- a/src/api/burn/appveyor.cmd +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | nuget restore || exit /b | ||
| 7 | |||
| 8 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 || exit /b | ||
| 9 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 || exit /b | ||
| 10 | |||
| 11 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 || exit /b | ||
| 12 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 || exit /b | ||
| 13 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b | ||
| 14 | |||
| 15 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 || exit /b | ||
| 16 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b | ||
| 17 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b | ||
| 18 | |||
| 19 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b | ||
| 20 | |||
| 21 | msbuild -t:PackNative -p:Configuration=%_C% src\balutil\balutil.vcxproj || exit /b | ||
| 22 | msbuild -t:PackNative -p:Configuration=%_C% src\bextutil\bextutil.vcxproj || exit /b | ||
| 23 | msbuild -t:PackNative -p:Configuration=%_C% src\WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj || exit /b | ||
| 24 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b | ||
| 25 | |||
| 26 | @popd | ||
| 27 | @endlocal \ No newline at end of file | ||
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec index e38362ec..82509140 100644 --- a/src/api/burn/balutil/balutil.nuspec +++ b/src/api/burn/balutil/balutil.nuspec | |||
| @@ -1,31 +1,32 @@ | |||
| 1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
| 2 | <package > | 2 | <package > |
| 3 | <metadata> | 3 | <metadata minClientVersion="4.0"> |
| 4 | <id>$id$</id> | 4 | <id>$id$</id> |
| 5 | <version>$version$</version> | 5 | <version>$version$</version> |
| 6 | <title>$title$</title> | ||
| 7 | <description>$description$</description> | ||
| 6 | <authors>$authors$</authors> | 8 | <authors>$authors$</authors> |
| 7 | <owners>$authors$</owners> | ||
| 8 | <license type="expression">MS-RL</license> | 9 | <license type="expression">MS-RL</license> |
| 9 | <projectUrl>https://github.com/wixtoolset/balutil</projectUrl> | ||
| 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
| 11 | <description>$description$</description> | ||
| 12 | <copyright>$copyright$</copyright> | 11 | <copyright>$copyright$</copyright> |
| 12 | <projectUrl>$projectUrl$</projectUrl> | ||
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
| 13 | <dependencies> | 14 | <dependencies> |
| 14 | <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" /> | 15 | <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" /> |
| 15 | <dependency id="WixToolset.DUtil" version="[4,5)" /> | 16 | <dependency id="WixToolset.DUtil" version="[4,5)" /> |
| 16 | </dependencies> | 17 | </dependencies> |
| 17 | </metadata> | 18 | </metadata> |
| 18 | 19 | ||
| 19 | <files> | 20 | <files> |
| 20 | <file src="build\$id$.props" target="build\" /> | 21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
| 21 | <file src="inc\*" target="build\native\include" /> | 22 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
| 22 | <file src="..\..\build\$configuration$\v140\x86\balutil.lib" target="build\native\v140\x86" /> | 23 | <!-- <file src="..\..\v140\x86\balutil.lib" target="build\native\v140\x86" /> |
| 23 | <file src="..\..\build\$configuration$\v140\x64\balutil.lib" target="build\native\v140\x64" /> | 24 | <file src="..\..\v140\x64\balutil.lib" target="build\native\v140\x64" /> |
| 24 | <file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" /> | 25 | <file src="..\..\v141\x86\balutil.lib" target="build\native\v141\x86" /> |
| 25 | <file src="..\..\build\$configuration$\v141\x64\balutil.lib" target="build\native\v141\x64" /> | 26 | <file src="..\..\v141\x64\balutil.lib" target="build\native\v141\x64" /> |
| 26 | <file src="..\..\build\$configuration$\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> | 27 | <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> --> |
| 27 | <file src="..\..\build\$configuration$\v142\x86\balutil.lib" target="build\native\v142\x86" /> | 28 | <file src="..\..\v142\x86\balutil.lib" target="build\native\v142\x86" /> |
| 28 | <file src="..\..\build\$configuration$\v142\x64\balutil.lib" target="build\native\v142\x64" /> | 29 | <file src="..\..\v142\x64\balutil.lib" target="build\native\v142\x64" /> |
| 29 | <file src="..\..\build\$configuration$\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" /> | 30 | <file src="..\..\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" /> |
| 30 | </files> | 31 | </files> |
| 31 | </package> | 32 | </package> |
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj index ab33f159..8f763324 100644 --- a/src/api/burn/balutil/balutil.vcxproj +++ b/src/api/burn/balutil/balutil.vcxproj | |||
| @@ -2,9 +2,6 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
| 6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 7 | |||
| 8 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 9 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 10 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -44,8 +41,7 @@ | |||
| 44 | 41 | ||
| 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 46 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 47 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | 44 | <Import Project="..\..\..\NativeMultiTargeting.Build.props" /> |
| 48 | <Import Project="..\NativeMultiTargeting.Build.props" /> | ||
| 49 | 45 | ||
| 50 | <ImportGroup Label="ExtensionSettings"> | 46 | <ImportGroup Label="ExtensionSettings"> |
| 51 | </ImportGroup> | 47 | </ImportGroup> |
| @@ -54,7 +50,7 @@ | |||
| 54 | </ImportGroup> | 50 | </ImportGroup> |
| 55 | 51 | ||
| 56 | <PropertyGroup> | 52 | <PropertyGroup> |
| 57 | <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories> | 53 | <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> |
| 58 | </PropertyGroup> | 54 | </PropertyGroup> |
| 59 | 55 | ||
| 60 | <ItemGroup> | 56 | <ItemGroup> |
| @@ -86,16 +82,11 @@ | |||
| 86 | </ItemGroup> | 82 | </ItemGroup> |
| 87 | 83 | ||
| 88 | <ItemGroup> | 84 | <ItemGroup> |
| 89 | <None Include="packages.config" /> | 85 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 86 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 87 | |||
| 88 | <PackageReference Include="WixToolset.DUtil" /> | ||
| 90 | </ItemGroup> | 89 | </ItemGroup> |
| 91 | 90 | ||
| 92 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 91 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 93 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 92 | </Project> |
| 94 | <PropertyGroup> | ||
| 95 | <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> | ||
| 96 | </PropertyGroup> | ||
| 97 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 98 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 99 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 100 | </Target> | ||
| 101 | </Project> \ No newline at end of file | ||
diff --git a/src/api/burn/balutil/packages.config b/src/api/burn/balutil/packages.config deleted file mode 100644 index 08ea3364..00000000 --- a/src/api/burn/balutil/packages.config +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
| 5 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 6 | </packages> \ No newline at end of file | ||
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec index 752dbb97..e75c4a43 100644 --- a/src/api/burn/bextutil/bextutil.nuspec +++ b/src/api/burn/bextutil/bextutil.nuspec | |||
| @@ -1,31 +1,32 @@ | |||
| 1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
| 2 | <package > | 2 | <package > |
| 3 | <metadata> | 3 | <metadata minClientVersion="4.0"> |
| 4 | <id>$id$</id> | 4 | <id>$id$</id> |
| 5 | <version>$version$</version> | 5 | <version>$version$</version> |
| 6 | <title>$title$</title> | ||
| 7 | <description>$description$</description> | ||
| 6 | <authors>$authors$</authors> | 8 | <authors>$authors$</authors> |
| 7 | <owners>$authors$</owners> | ||
| 8 | <license type="expression">MS-RL</license> | 9 | <license type="expression">MS-RL</license> |
| 9 | <projectUrl>https://github.com/wixtoolset/balutil</projectUrl> | ||
| 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
| 11 | <description>$description$</description> | ||
| 12 | <copyright>$copyright$</copyright> | 11 | <copyright>$copyright$</copyright> |
| 12 | <projectUrl>$projectUrl$</projectUrl> | ||
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
| 13 | <dependencies> | 14 | <dependencies> |
| 14 | <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" /> | 15 | <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" /> |
| 15 | <dependency id="WixToolset.DUtil" version="[4,5)" /> | 16 | <dependency id="WixToolset.DUtil" version="[4,5)" /> |
| 16 | </dependencies> | 17 | </dependencies> |
| 17 | </metadata> | 18 | </metadata> |
| 18 | 19 | ||
| 19 | <files> | 20 | <files> |
| 20 | <file src="build\$id$.props" target="build\" /> | 21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
| 21 | <file src="inc\*" target="build\native\include" /> | 22 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
| 22 | <file src="..\..\build\$configuration$\v140\x86\bextutil.lib" target="build\native\v140\x86" /> | 23 | <file src="..\..\v140\x86\bextutil.lib" target="build\native\v140\x86" /> |
| 23 | <file src="..\..\build\$configuration$\v140\x64\bextutil.lib" target="build\native\v140\x64" /> | 24 | <file src="..\..\v140\x64\bextutil.lib" target="build\native\v140\x64" /> |
| 24 | <file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" /> | 25 | <file src="..\..\v141\x86\bextutil.lib" target="build\native\v141\x86" /> |
| 25 | <file src="..\..\build\$configuration$\v141\x64\bextutil.lib" target="build\native\v141\x64" /> | 26 | <file src="..\..\v141\x64\bextutil.lib" target="build\native\v141\x64" /> |
| 26 | <file src="..\..\build\$configuration$\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" /> | 27 | <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" /> |
| 27 | <file src="..\..\build\$configuration$\v142\x86\bextutil.lib" target="build\native\v142\x86" /> | 28 | <file src="..\..\v142\x86\bextutil.lib" target="build\native\v142\x86" /> |
| 28 | <file src="..\..\build\$configuration$\v142\x64\bextutil.lib" target="build\native\v142\x64" /> | 29 | <file src="..\..\v142\x64\bextutil.lib" target="build\native\v142\x64" /> |
| 29 | <file src="..\..\build\$configuration$\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" /> | 30 | <file src="..\..\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" /> |
| 30 | </files> | 31 | </files> |
| 31 | </package> | 32 | </package> |
diff --git a/src/api/burn/bextutil/bextutil.vcxproj b/src/api/burn/bextutil/bextutil.vcxproj index b9334cf3..cbb83b96 100644 --- a/src/api/burn/bextutil/bextutil.vcxproj +++ b/src/api/burn/bextutil/bextutil.vcxproj | |||
| @@ -2,9 +2,6 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
| 6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 7 | |||
| 8 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 9 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 10 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -44,8 +41,7 @@ | |||
| 44 | 41 | ||
| 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 46 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 47 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | 44 | <Import Project="..\..\..\NativeMultiTargeting.Build.props" /> |
| 48 | <Import Project="..\NativeMultiTargeting.Build.props" /> | ||
| 49 | 45 | ||
| 50 | <ImportGroup Label="ExtensionSettings"> | 46 | <ImportGroup Label="ExtensionSettings"> |
| 51 | </ImportGroup> | 47 | </ImportGroup> |
| @@ -54,7 +50,7 @@ | |||
| 54 | </ImportGroup> | 50 | </ImportGroup> |
| 55 | 51 | ||
| 56 | <PropertyGroup> | 52 | <PropertyGroup> |
| 57 | <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories> | 53 | <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> |
| 58 | </PropertyGroup> | 54 | </PropertyGroup> |
| 59 | 55 | ||
| 60 | <ItemGroup> | 56 | <ItemGroup> |
| @@ -75,16 +71,11 @@ | |||
| 75 | </ItemGroup> | 71 | </ItemGroup> |
| 76 | 72 | ||
| 77 | <ItemGroup> | 73 | <ItemGroup> |
| 78 | <None Include="packages.config" /> | 74 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 75 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 76 | |||
| 77 | <PackageReference Include="WixToolset.DUtil" /> | ||
| 79 | </ItemGroup> | 78 | </ItemGroup> |
| 80 | 79 | ||
| 81 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 80 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 82 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 81 | </Project> |
| 83 | <PropertyGroup> | ||
| 84 | <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> | ||
| 85 | </PropertyGroup> | ||
| 86 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 87 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 88 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 89 | </Target> | ||
| 90 | </Project> \ No newline at end of file | ||
diff --git a/src/api/burn/bextutil/packages.config b/src/api/burn/bextutil/packages.config deleted file mode 100644 index 08ea3364..00000000 --- a/src/api/burn/bextutil/packages.config +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
| 5 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 6 | </packages> \ No newline at end of file | ||
diff --git a/src/api/burn/mbanative/mbanative.vcxproj b/src/api/burn/mbanative/mbanative.vcxproj index f91fe3be..af02f34e 100644 --- a/src/api/burn/mbanative/mbanative.vcxproj +++ b/src/api/burn/mbanative/mbanative.vcxproj | |||
| @@ -2,12 +2,6 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
| 6 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> | ||
| 7 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | ||
| 8 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | ||
| 9 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 10 | |||
| 11 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 12 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 13 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -47,18 +41,10 @@ | |||
| 47 | 41 | ||
| 48 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 49 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 50 | <Import Project="..\NativeMultiTargeting.Build.props" /> | 44 | <Import Project="..\..\..\NativeMultiTargeting.Build.props" /> |
| 51 | |||
| 52 | <ImportGroup Label="Shared"> | ||
| 53 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" /> | ||
| 54 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" /> | ||
| 55 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" /> | ||
| 56 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
| 57 | </ImportGroup> | ||
| 58 | 45 | ||
| 59 | <PropertyGroup> | 46 | <PropertyGroup> |
| 60 | <ProjectAdditionalIncludeDirectories>..\balutil\inc</ProjectAdditionalIncludeDirectories> | 47 | <ProjectAdditionalIncludeDirectories>..\balutil\inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> |
| 61 | <ProjectAdditionalLinkLibraries>balutil.lib</ProjectAdditionalLinkLibraries> | ||
| 62 | </PropertyGroup> | 48 | </PropertyGroup> |
| 63 | 49 | ||
| 64 | <ItemGroup> | 50 | <ItemGroup> |
| @@ -75,28 +61,18 @@ | |||
| 75 | </ItemGroup> | 61 | </ItemGroup> |
| 76 | 62 | ||
| 77 | <ItemGroup> | 63 | <ItemGroup> |
| 78 | <None Include="packages.config" /> | ||
| 79 | </ItemGroup> | ||
| 80 | |||
| 81 | <ItemGroup> | ||
| 82 | <ProjectReference Include="..\balutil\balutil.vcxproj"> | 64 | <ProjectReference Include="..\balutil\balutil.vcxproj"> |
| 83 | <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> | 65 | <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> |
| 66 | <Properties>Configuration=$(Configuration);Platform=$(Platform)</Properties> | ||
| 84 | </ProjectReference> | 67 | </ProjectReference> |
| 85 | </ItemGroup> | 68 | </ItemGroup> |
| 86 | 69 | ||
| 70 | <ItemGroup> | ||
| 71 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 72 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 73 | |||
| 74 | <PackageReference Include="WixToolset.DUtil" /> | ||
| 75 | </ItemGroup> | ||
| 76 | |||
| 87 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 77 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 88 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 78 | </Project> |
| 89 | <PropertyGroup> | ||
| 90 | <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> | ||
| 91 | </PropertyGroup> | ||
| 92 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" /> | ||
| 93 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" /> | ||
| 94 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" /> | ||
| 95 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" /> | ||
| 96 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> | ||
| 97 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | ||
| 98 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 99 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 100 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 101 | </Target> | ||
| 102 | </Project> \ No newline at end of file | ||
diff --git a/src/api/burn/mbanative/packages.config b/src/api/burn/mbanative/packages.config deleted file mode 100644 index 745fcae9..00000000 --- a/src/api/burn/mbanative/packages.config +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 7 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
| 8 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 9 | </packages> \ No newline at end of file | ||
diff --git a/src/api/burn/nuget.config b/src/api/burn/nuget.config deleted file mode 100644 index 2c6c5608..00000000 --- a/src/api/burn/nuget.config +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 6 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 7 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 8 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 9 | </packageSources> | ||
| 10 | </configuration> \ No newline at end of file | ||
diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj index d3a81e2a..345c324c 100644 --- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj +++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | |||
| @@ -3,9 +3,8 @@ | |||
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 6 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | 6 | <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" /> |
| 7 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" /> | 7 | |
| 8 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 9 | <ItemGroup Label="ProjectConfigurations"> | 8 | <ItemGroup Label="ProjectConfigurations"> |
| 10 | <ProjectConfiguration Include="Debug|Win32"> | 9 | <ProjectConfiguration Include="Debug|Win32"> |
| 11 | <Configuration>Debug</Configuration> | 10 | <Configuration>Debug</Configuration> |
| @@ -16,6 +15,7 @@ | |||
| 16 | <Platform>Win32</Platform> | 15 | <Platform>Win32</Platform> |
| 17 | </ProjectConfiguration> | 16 | </ProjectConfiguration> |
| 18 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | |||
| 19 | <PropertyGroup Label="Globals"> | 19 | <PropertyGroup Label="Globals"> |
| 20 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> | 20 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> |
| 21 | <ProjectGuid>{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}</ProjectGuid> | 21 | <ProjectGuid>{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}</ProjectGuid> |
| @@ -26,12 +26,15 @@ | |||
| 26 | <CLRSupport>true</CLRSupport> | 26 | <CLRSupport>true</CLRSupport> |
| 27 | <SignOutput>false</SignOutput> | 27 | <SignOutput>false</SignOutput> |
| 28 | </PropertyGroup> | 28 | </PropertyGroup> |
| 29 | |||
| 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 31 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 32 | |||
| 31 | <PropertyGroup> | 33 | <PropertyGroup> |
| 32 | <ProjectAdditionalIncludeDirectories>..\..\balutil\inc</ProjectAdditionalIncludeDirectories> | 34 | <ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories> |
| 33 | <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries> | 35 | <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries> |
| 34 | </PropertyGroup> | 36 | </PropertyGroup> |
| 37 | |||
| 35 | <ItemGroup> | 38 | <ItemGroup> |
| 36 | <ClCompile Include="precomp.cpp"> | 39 | <ClCompile Include="precomp.cpp"> |
| 37 | <PrecompiledHeader>Create</PrecompiledHeader> | 40 | <PrecompiledHeader>Create</PrecompiledHeader> |
| @@ -41,36 +44,17 @@ | |||
| 41 | <ClCompile Include="TestBAFunctions.cpp" /> | 44 | <ClCompile Include="TestBAFunctions.cpp" /> |
| 42 | <ClCompile Include="TestBootstrapperApplication.cpp" /> | 45 | <ClCompile Include="TestBootstrapperApplication.cpp" /> |
| 43 | </ItemGroup> | 46 | </ItemGroup> |
| 47 | |||
| 44 | <ItemGroup> | 48 | <ItemGroup> |
| 45 | <ClInclude Include="precomp.h" /> | 49 | <ClInclude Include="precomp.h" /> |
| 46 | </ItemGroup> | 50 | </ItemGroup> |
| 47 | <ItemGroup> | 51 | |
| 48 | <None Include="packages.config" /> | ||
| 49 | </ItemGroup> | ||
| 50 | <ItemGroup> | ||
| 51 | <Reference Include="System" /> | ||
| 52 | <Reference Include="System.Core" /> | ||
| 53 | <Reference Include="WixBuildTools.TestSupport"> | ||
| 54 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath> | ||
| 55 | </Reference> | ||
| 56 | <Reference Include="WixBuildTools.TestSupport.Native"> | ||
| 57 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> | ||
| 58 | </Reference> | ||
| 59 | </ItemGroup> | ||
| 60 | <ItemGroup> | 52 | <ItemGroup> |
| 61 | <ProjectReference Include="..\..\balutil\balutil.vcxproj"> | 53 | <ProjectReference Include="..\..\balutil\balutil.vcxproj"> |
| 62 | <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> | 54 | <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> |
| 63 | </ProjectReference> | 55 | </ProjectReference> |
| 64 | </ItemGroup> | 56 | </ItemGroup> |
| 57 | |||
| 65 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 58 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 66 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" /> | 59 | <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" /> |
| 67 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 60 | </Project> |
| 68 | <PropertyGroup> | ||
| 69 | <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> | ||
| 70 | </PropertyGroup> | ||
| 71 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" /> | ||
| 72 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" /> | ||
| 73 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 74 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 75 | </Target> | ||
| 76 | </Project> \ No newline at end of file | ||
diff --git a/src/api/burn/test/BalUtilUnitTest/packages.config b/src/api/burn/test/BalUtilUnitTest/packages.config deleted file mode 100644 index 6d381fbe..00000000 --- a/src/api/burn/test/BalUtilUnitTest/packages.config +++ /dev/null | |||
| @@ -1,15 +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 | <packages> | ||
| 4 | <package id="WixBuildTools.TestSupport" version="4.0.50" /> | ||
| 5 | <package id="WixBuildTools.TestSupport.Native" version="4.0.50" /> | ||
| 6 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
| 7 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 8 | <package id="xunit.abstractions" version="2.0.3" /> | ||
| 9 | <package id="xunit.assert" version="2.4.1" /> | ||
| 10 | <package id="xunit.core" version="2.4.1" /> | ||
| 11 | <package id="xunit.extensibility.core" version="2.4.1" /> | ||
| 12 | <package id="xunit.extensibility.execution" version="2.4.1" /> | ||
| 13 | <package id="xunit.runner.msbuild" version="2.4.1" /> | ||
| 14 | <package id="xunit.runner.visualstudio" version="2.4.1" /> | ||
| 15 | </packages> \ No newline at end of file | ||
diff --git a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj index a9937894..fc31ce57 100644 --- a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj +++ b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj | |||
| @@ -1,11 +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 | 3 | ||
| 4 | |||
| 5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 6 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" /> |
| 7 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" /> | 6 | |
| 8 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 9 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
| 10 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|Win32"> |
| 11 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
| @@ -16,6 +14,7 @@ | |||
| 16 | <Platform>Win32</Platform> | 14 | <Platform>Win32</Platform> |
| 17 | </ProjectConfiguration> | 15 | </ProjectConfiguration> |
| 18 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | |||
| 19 | <PropertyGroup Label="Globals"> | 18 | <PropertyGroup Label="Globals"> |
| 20 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> | 19 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> |
| 21 | <ProjectGuid>{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}</ProjectGuid> | 20 | <ProjectGuid>{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}</ProjectGuid> |
| @@ -26,12 +25,15 @@ | |||
| 26 | <CLRSupport>true</CLRSupport> | 25 | <CLRSupport>true</CLRSupport> |
| 27 | <SignOutput>false</SignOutput> | 26 | <SignOutput>false</SignOutput> |
| 28 | </PropertyGroup> | 27 | </PropertyGroup> |
| 28 | |||
| 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 31 | |||
| 31 | <PropertyGroup> | 32 | <PropertyGroup> |
| 32 | <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc</ProjectAdditionalIncludeDirectories> | 33 | <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories> |
| 33 | <ProjectAdditionalLinkLibraries></ProjectAdditionalLinkLibraries> | 34 | <ProjectAdditionalLinkLibraries>$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries> |
| 34 | </PropertyGroup> | 35 | </PropertyGroup> |
| 36 | |||
| 35 | <ItemGroup> | 37 | <ItemGroup> |
| 36 | <ClCompile Include="precomp.cpp"> | 38 | <ClCompile Include="precomp.cpp"> |
| 37 | <PrecompiledHeader>Create</PrecompiledHeader> | 39 | <PrecompiledHeader>Create</PrecompiledHeader> |
| @@ -40,36 +42,17 @@ | |||
| 40 | </ClCompile> | 42 | </ClCompile> |
| 41 | <ClCompile Include="TestBundleExtension.cpp" /> | 43 | <ClCompile Include="TestBundleExtension.cpp" /> |
| 42 | </ItemGroup> | 44 | </ItemGroup> |
| 45 | |||
| 43 | <ItemGroup> | 46 | <ItemGroup> |
| 44 | <ClInclude Include="precomp.h" /> | 47 | <ClInclude Include="precomp.h" /> |
| 45 | </ItemGroup> | 48 | </ItemGroup> |
| 49 | |||
| 46 | <ItemGroup> | 50 | <ItemGroup> |
| 47 | <None Include="packages.config" /> | 51 | <ProjectReference Include="..\..\bextutil\bextutil.vcxproj"> |
| 48 | </ItemGroup> | ||
| 49 | <ItemGroup> | ||
| 50 | <Reference Include="System" /> | ||
| 51 | <Reference Include="System.Core" /> | ||
| 52 | <Reference Include="WixBuildTools.TestSupport"> | ||
| 53 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath> | ||
| 54 | </Reference> | ||
| 55 | <Reference Include="WixBuildTools.TestSupport.Native"> | ||
| 56 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> | ||
| 57 | </Reference> | ||
| 58 | </ItemGroup> | ||
| 59 | <ItemGroup> | ||
| 60 | <ProjectReference Include="..\..\balutil\balutil.vcxproj"> | ||
| 61 | <Project>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</Project> | 52 | <Project>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</Project> |
| 62 | </ProjectReference> | 53 | </ProjectReference> |
| 63 | </ItemGroup> | 54 | </ItemGroup> |
| 55 | |||
| 64 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 56 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 65 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" /> | 57 | <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" /> |
| 66 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 58 | </Project> |
| 67 | <PropertyGroup> | ||
| 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> | ||
| 70 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" /> | ||
| 71 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" /> | ||
| 72 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 73 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 74 | </Target> | ||
| 75 | </Project> \ No newline at end of file | ||
diff --git a/src/api/burn/test/BextUtilUnitTest/packages.config b/src/api/burn/test/BextUtilUnitTest/packages.config deleted file mode 100644 index 6d381fbe..00000000 --- a/src/api/burn/test/BextUtilUnitTest/packages.config +++ /dev/null | |||
| @@ -1,15 +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 | <packages> | ||
| 4 | <package id="WixBuildTools.TestSupport" version="4.0.50" /> | ||
| 5 | <package id="WixBuildTools.TestSupport.Native" version="4.0.50" /> | ||
| 6 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
| 7 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 8 | <package id="xunit.abstractions" version="2.0.3" /> | ||
| 9 | <package id="xunit.assert" version="2.4.1" /> | ||
| 10 | <package id="xunit.core" version="2.4.1" /> | ||
| 11 | <package id="xunit.extensibility.core" version="2.4.1" /> | ||
| 12 | <package id="xunit.extensibility.execution" version="2.4.1" /> | ||
| 13 | <package id="xunit.runner.msbuild" version="2.4.1" /> | ||
| 14 | <package id="xunit.runner.visualstudio" version="2.4.1" /> | ||
| 15 | </packages> \ No newline at end of file | ||
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj index 53d82f7e..bdb6a829 100644 --- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj +++ b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | 15 | ||
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | 17 | <PackageReference Include="xunit" /> |
| 18 | <PackageReference Include="xunit" Version="2.4.1" /> | 18 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
| 19 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 20 | </ItemGroup> | 19 | </ItemGroup> |
| 21 | </Project> | 20 | </Project> |
diff --git a/src/api/wix/CSharp.Build.props b/src/api/wix/CSharp.Build.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/api/wix/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/api/wix/Directory.Build.props b/src/api/wix/Directory.Build.props deleted file mode 100644 index b3c6287c..00000000 --- a/src/api/wix/Directory.Build.props +++ /dev/null | |||
| @@ -1,27 +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.props | ||
| 5 | then update all of the repos. | ||
| 6 | --> | ||
| 7 | <Project> | ||
| 8 | <PropertyGroup> | ||
| 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 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> | ||
| 24 | |||
| 25 | <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | ||
| 26 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 27 | </Project> | ||
diff --git a/src/api/wix/Directory.Build.targets b/src/api/wix/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/api/wix/Directory.Build.targets +++ /dev/null | |||
| @@ -1,51 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | |||
| 49 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 50 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 51 | </Project> | ||
diff --git a/src/api/wix/Directory.csproj.props b/src/api/wix/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/api/wix/Directory.csproj.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/api/wix/Directory.csproj.targets b/src/api/wix/Directory.csproj.targets deleted file mode 100644 index 623228ef..00000000 --- a/src/api/wix/Directory.csproj.targets +++ /dev/null | |||
| @@ -1,25 +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\Directory.csproj.targets | ||
| 4 | then update all of the repos. | ||
| 5 | --> | ||
| 6 | <Project> | ||
| 7 | <PropertyGroup> | ||
| 8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 13 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 14 | <PropertyGroup> | ||
| 15 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 16 | |||
| 17 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 18 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath> | ||
| 19 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 20 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 21 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 22 | </PropertyGroup> | ||
| 23 | </Target> | ||
| 24 | |||
| 25 | </Project> | ||
diff --git a/src/api/wix/README-Extensibility.md b/src/api/wix/README-Extensibility.md deleted file mode 100644 index 003acd4d..00000000 --- a/src/api/wix/README-Extensibility.md +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | # Extensibility | ||
| 2 | WixToolset.Extensibility - interfaces to extend the WiX Toolset | ||
diff --git a/src/api/wix/README.md b/src/api/wix/README.md deleted file mode 100644 index 720632c9..00000000 --- a/src/api/wix/README.md +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | # Data | ||
| 2 | WixToolset.Data - data model for WiX Toolset tools | ||
| 3 | |||
diff --git a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj index 24b0917b..11c3fd98 100644 --- a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj +++ b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj | |||
| @@ -15,15 +15,6 @@ | |||
| 15 | </PropertyGroup> | 15 | </PropertyGroup> |
| 16 | 16 | ||
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="System.IO.Compression" Version="4.3.0" /> | ||
| 19 | </ItemGroup> | ||
| 20 | |||
| 21 | <ItemGroup> | ||
| 22 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 23 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
| 24 | </ItemGroup> | ||
| 25 | |||
| 26 | <ItemGroup> | ||
| 27 | <Compile Update="WixDataStrings.Designer.cs"> | 18 | <Compile Update="WixDataStrings.Designer.cs"> |
| 28 | <DesignTime>True</DesignTime> | 19 | <DesignTime>True</DesignTime> |
| 29 | <AutoGen>True</AutoGen> | 20 | <AutoGen>True</AutoGen> |
| @@ -37,4 +28,8 @@ | |||
| 37 | <LastGenOutput>WixDataStrings.Designer.cs</LastGenOutput> | 28 | <LastGenOutput>WixDataStrings.Designer.cs</LastGenOutput> |
| 38 | </EmbeddedResource> | 29 | </EmbeddedResource> |
| 39 | </ItemGroup> | 30 | </ItemGroup> |
| 31 | |||
| 32 | <ItemGroup> | ||
| 33 | <PackageReference Include="System.IO.Compression" /> | ||
| 34 | </ItemGroup> | ||
| 40 | </Project> | 35 | </Project> |
diff --git a/src/api/wix/WixToolset.Extensibility.sln b/src/api/wix/WixToolset.Extensibility.sln deleted file mode 100644 index 94ce905c..00000000 --- a/src/api/wix/WixToolset.Extensibility.sln +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 2 | # Visual Studio 15 | ||
| 3 | VisualStudioVersion = 15.0.26730.8 | ||
| 4 | MinimumVisualStudioVersion = 15.0.26124.0 | ||
| 5 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Extensibility", "src\WixToolset.Extensibility\WixToolset.Extensibility.csproj", "{AA049009-D7D9-4C63-8E0D-83206ADCFBD1}" | ||
| 6 | EndProject | ||
| 7 | Global | ||
| 8 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 9 | Debug|Any CPU = Debug|Any CPU | ||
| 10 | Debug|x64 = Debug|x64 | ||
| 11 | Debug|x86 = Debug|x86 | ||
| 12 | Release|Any CPU = Release|Any CPU | ||
| 13 | Release|x64 = Release|x64 | ||
| 14 | Release|x86 = Release|x86 | ||
| 15 | EndGlobalSection | ||
| 16 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 17 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 18 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 19 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 20 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 21 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 22 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 23 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 24 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 25 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 26 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.Build.0 = Release|Any CPU | ||
| 27 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 28 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.Build.0 = Release|Any CPU | ||
| 29 | EndGlobalSection | ||
| 30 | GlobalSection(SolutionProperties) = preSolution | ||
| 31 | HideSolutionNode = FALSE | ||
| 32 | EndGlobalSection | ||
| 33 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 34 | SolutionGuid = {BB8820D5-723D-426D-B4A0-4D221603C5FA} | ||
| 35 | EndGlobalSection | ||
| 36 | EndGlobal | ||
diff --git a/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj b/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj index 8b18c0ed..38bec1b0 100644 --- a/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj +++ b/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj | |||
| @@ -13,11 +13,6 @@ | |||
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | 16 | <ProjectReference Include="..\WixToolset.Data\WixToolset.Data.csproj" /> |
| 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> | 17 | </ItemGroup> |
| 23 | </Project> | 18 | </Project> |
diff --git a/src/api/wix/WixToolset.Data.sln b/src/api/wix/api_wix.sln index d8c62b1d..6b799e66 100644 --- a/src/api/wix/WixToolset.Data.sln +++ b/src/api/wix/api_wix.sln | |||
| @@ -3,9 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio 15 | 3 | # Visual Studio 15 |
| 4 | VisualStudioVersion = 15.0.27004.2009 | 4 | VisualStudioVersion = 15.0.27004.2009 |
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "src\WixToolset.Data\WixToolset.Data.csproj", "{73ADBD3A-8FB2-47DB-BC79-9BC61C40F2E0}" | 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "WixToolset.Data\WixToolset.Data.csproj", "{73ADBD3A-8FB2-47DB-BC79-9BC61C40F2E0}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Data", "src\test\WixToolsetTest.Data\WixToolsetTest.Data.csproj", "{6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}" | 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Data", "test\WixToolsetTest.Data\WixToolsetTest.Data.csproj", "{6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}" |
| 9 | EndProject | ||
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Extensibility", "WixToolset.Extensibility\WixToolset.Extensibility.csproj", "{AA049009-D7D9-4C63-8E0D-83206ADCFBD1}" | ||
| 9 | EndProject | 11 | EndProject |
| 10 | Global | 12 | Global |
| 11 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
| @@ -51,6 +53,18 @@ Global | |||
| 51 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x64.Build.0 = Release|Any CPU | 53 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x64.Build.0 = Release|Any CPU |
| 52 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x86.ActiveCfg = Release|Any CPU | 54 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x86.ActiveCfg = Release|Any CPU |
| 53 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x86.Build.0 = Release|Any CPU | 55 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x86.Build.0 = Release|Any CPU |
| 56 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 57 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 58 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 59 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 60 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 61 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 62 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 63 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 64 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 65 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.Build.0 = Release|Any CPU | ||
| 66 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 67 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.Build.0 = Release|Any CPU | ||
| 54 | EndGlobalSection | 68 | EndGlobalSection |
| 55 | GlobalSection(SolutionProperties) = preSolution | 69 | GlobalSection(SolutionProperties) = preSolution |
| 56 | HideSolutionNode = FALSE | 70 | HideSolutionNode = FALSE |
diff --git a/src/api/wix/appveyor-Extensibility.cmd b/src/api/wix/appveyor-Extensibility.cmd deleted file mode 100644 index e0dfe33f..00000000 --- a/src/api/wix/appveyor-Extensibility.cmd +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | dotnet pack -c Release | ||
| 5 | |||
| 6 | @popd | ||
| 7 | @endlocal \ No newline at end of file | ||
diff --git a/src/api/wix/appveyor-Extensibility.yml b/src/api/wix/appveyor-Extensibility.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/api/wix/appveyor-Extensibility.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/api/wix/appveyor.cmd b/src/api/wix/appveyor.cmd deleted file mode 100644 index 5e5debc9..00000000 --- a/src/api/wix/appveyor.cmd +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | :: Restore | ||
| 7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
| 8 | |||
| 9 | :: Build | ||
| 10 | msbuild -p:Configuration=%_C% || exit /b | ||
| 11 | |||
| 12 | :: Test | ||
| 13 | dotnet test -c %_C% --no-build || exit /b | ||
| 14 | |||
| 15 | :: Pack | ||
| 16 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack || exit /b | ||
| 17 | |||
| 18 | @popd | ||
| 19 | @endlocal | ||
diff --git a/src/api/wix/appveyor.yml b/src/api/wix/appveyor.yml deleted file mode 100644 index c53cc9cc..00000000 --- a/src/api/wix/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\**\*.snupkg | ||
| 37 | name: snupkg | ||
| 38 | |||
| 39 | notifications: | ||
| 40 | - provider: Slack | ||
| 41 | incoming_webhook: | ||
| 42 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/api/wix/nuget-Extensibility.config b/src/api/wix/nuget-Extensibility.config deleted file mode 100644 index 6ab85be3..00000000 --- a/src/api/wix/nuget-Extensibility.config +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 6 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 7 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 8 | </packageSources> | ||
| 9 | </configuration> \ No newline at end of file | ||
diff --git a/src/api/wix/nuget.config b/src/api/wix/nuget.config deleted file mode 100644 index d5ef8952..00000000 --- a/src/api/wix/nuget.config +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 6 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 7 | </packageSources> | ||
| 8 | </configuration> \ No newline at end of file | ||
diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj index fb0f8594..f6e10488 100644 --- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj +++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj | |||
| @@ -1,9 +1,11 @@ | |||
| 1 | <Project Sdk="Microsoft.NET.Sdk"> | 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 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | ||
| 3 | <PropertyGroup> | 5 | <PropertyGroup> |
| 4 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 5 | |||
| 6 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 7 | </PropertyGroup> | 9 | </PropertyGroup> |
| 8 | 10 | ||
| 9 | <ItemGroup> | 11 | <ItemGroup> |
| @@ -11,9 +13,8 @@ | |||
| 11 | </ItemGroup> | 13 | </ItemGroup> |
| 12 | 14 | ||
| 13 | <ItemGroup> | 15 | <ItemGroup> |
| 14 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> | 16 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 15 | <PackageReference Include="xunit" Version="2.4.1" /> | 17 | <PackageReference Include="xunit" /> |
| 16 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 18 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
| 17 | </ItemGroup> | 19 | </ItemGroup> |
| 18 | |||
| 19 | </Project> | 20 | </Project> |
diff --git a/src/build_all.cmd b/src/build_all.cmd new file mode 100644 index 00000000..de9a22e6 --- /dev/null +++ b/src/build_all.cmd | |||
| @@ -0,0 +1,60 @@ | |||
| 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 build %_C% | ||
| 10 | |||
| 11 | :: Initialize required files/folders | ||
| 12 | |||
| 13 | call build_init.cmd | ||
| 14 | |||
| 15 | :: DTF | ||
| 16 | |||
| 17 | call dtf\dtf.cmd %_C% || exit /b | ||
| 18 | |||
| 19 | |||
| 20 | :: internal | ||
| 21 | |||
| 22 | call internal\internal.cmd %_C% || exit /b | ||
| 23 | |||
| 24 | |||
| 25 | :: libs | ||
| 26 | |||
| 27 | call libs\libs.cmd %_C% || exit /b | ||
| 28 | |||
| 29 | |||
| 30 | :: api | ||
| 31 | |||
| 32 | call api\api.cmd %_C% || exit /b | ||
| 33 | |||
| 34 | |||
| 35 | :: burn | ||
| 36 | |||
| 37 | call burn\burn.cmd %_C% || exit /b | ||
| 38 | |||
| 39 | |||
| 40 | :: wix | ||
| 41 | |||
| 42 | call wix\wix.cmd %_C% || exit /b | ||
| 43 | |||
| 44 | |||
| 45 | :: ext | ||
| 46 | |||
| 47 | call ext\ext.cmd %_C% || exit /b | ||
| 48 | |||
| 49 | |||
| 50 | :: samples | ||
| 51 | |||
| 52 | :: call samples\samples.cmd %_C% || exit /b | ||
| 53 | |||
| 54 | |||
| 55 | :: integration tests | ||
| 56 | |||
| 57 | call test\test.cmd %_C% || exit /b | ||
| 58 | |||
| 59 | @popd | ||
| 60 | @endlocal | ||
diff --git a/src/build_init.cmd b/src/build_init.cmd new file mode 100644 index 00000000..2c2c48f3 --- /dev/null +++ b/src/build_init.cmd | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | md ..\build\artifacts | ||
| 5 | |||
| 6 | msbuild -Restore -v:m internal\SetBuildNumber\SetBuildNumber.proj | ||
| 7 | |||
| 8 | @popd | ||
| 9 | @endlocal | ||
diff --git a/src/build_official.cmd b/src/build_official.cmd new file mode 100644 index 00000000..55ac3550 --- /dev/null +++ b/src/build_official.cmd | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | @copy nuget_official.config nuget.config | ||
| 5 | |||
| 6 | build_all.cmd Release Official | ||
| 7 | |||
| 8 | @popd | ||
| 9 | @endlocal | ||
diff --git a/src/burn/Directory.Build.props b/src/burn/Directory.Build.props index fb34d54e..f929fa2b 100644 --- a/src/burn/Directory.Build.props +++ b/src/burn/Directory.Build.props | |||
| @@ -1,26 +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>burn</SegmentName> |
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | ||
| 11 | |||
| 12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | ||
| 13 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | ||
| 14 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | ||
| 15 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | ||
| 16 | |||
| 17 | <Authors>WiX Toolset Team</Authors> | ||
| 18 | <Company>WiX Toolset</Company> | ||
| 19 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | ||
| 20 | <PackageLicenseExpression>MS-RL</PackageLicenseExpression> | ||
| 21 | <Product>WiX Toolset</Product> | ||
| 22 | </PropertyGroup> | 7 | </PropertyGroup> |
| 23 | 8 | ||
| 24 | <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | 9 | <Import Project="..\Directory.Build.props" /> |
| 25 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 26 | </Project> | 10 | </Project> |
diff --git a/src/burn/Directory.Build.targets b/src/burn/Directory.Build.targets deleted file mode 100644 index 44701fb6..00000000 --- a/src/burn/Directory.Build.targets +++ /dev/null | |||
| @@ -1,73 +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 | <Project> | ||
| 8 | <PropertyGroup> | ||
| 9 | <SigningToolFolder>$(BaseOutputPath)obj\.tools</SigningToolFolder> | ||
| 10 | <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe> | ||
| 11 | <SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist> | ||
| 12 | <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration> | ||
| 13 | </PropertyGroup> | ||
| 14 | |||
| 15 | <PropertyGroup> | ||
| 16 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 17 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 18 | </PropertyGroup> | ||
| 19 | |||
| 20 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 21 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 22 | <PropertyGroup> | ||
| 23 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 24 | |||
| 25 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 26 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(MSBuildProjectDirectory)</NuspecBasePath> | ||
| 27 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors="$(Authors)";Configuration=$(Configuration);Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"</NuspecProperties> | ||
| 28 | <NuspecProperties>$(NuspecProperties);Version=$(NPMPackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 29 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 30 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 31 | </PropertyGroup> | ||
| 32 | </Target> | ||
| 33 | |||
| 34 | <Target Name="PackNative" DependsOnTargets="GetBuildVersion;SetNuspecProperties" | ||
| 35 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 36 | |||
| 37 | <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(BaseOutputPath)$(Configuration)" -BasePath "$(NuspecBasePath)" -Properties $(NuspecProperties)' | ||
| 38 | WorkingDirectory="$(MSBuildProjectDirectory)" /> | ||
| 39 | |||
| 40 | <ItemGroup> | ||
| 41 | <NuGetPackOutput Include="$(BaseOutputPath)$(Configuration)\**\$(PackageId)*.nupkg" /> | ||
| 42 | </ItemGroup> | ||
| 43 | </Target> | ||
| 44 | |||
| 45 | <Target Name="_GetSignClient" | ||
| 46 | Condition=" !Exists('$(SigningToolExe)') "> | ||
| 47 | |||
| 48 | <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' /> | ||
| 49 | |||
| 50 | <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' /> | ||
| 51 | </Target> | ||
| 52 | |||
| 53 | <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild" | ||
| 54 | Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and | ||
| 55 | ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))"> | ||
| 56 | |||
| 57 | <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | ||
| 58 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
| 59 | </Target> | ||
| 60 | |||
| 61 | <Target Name="SignNupkg" DependsOnTargets="_GetSignClient" AfterTargets="Pack;PackNative" | ||
| 62 | Condition=" '$(SigningUser)'!='' and '@(NuGetPackOutput)'!='' and '$(SignNupkg)'!='false' "> | ||
| 63 | <ItemGroup> | ||
| 64 | <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " /> | ||
| 65 | </ItemGroup> | ||
| 66 | |||
| 67 | <Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->'%(Identity)')" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | ||
| 68 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
| 69 | </Target> | ||
| 70 | |||
| 71 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 72 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 73 | </Project> | ||
diff --git a/src/burn/Directory.Packages.props b/src/burn/Directory.Packages.props deleted file mode 100644 index 369c51e7..00000000 --- a/src/burn/Directory.Packages.props +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | <Project> | ||
| 2 | <ItemGroup> | ||
| 3 | <PackageVersion Include="WixBuildTools.TestSupport" Version="4.0.47" /> | ||
| 4 | <PackageVersion Include="WixBuildTools.TestSupport.Native" Version="4.0.47" /> | ||
| 5 | <PackageVersion Include="WixToolset.DUtil" Version="4.0.70" targetFramework="native" /> | ||
| 6 | <PackageVersion Include="WixToolset.BootstrapperCore.Native" Version="4.0.57" targetFramework="native" /> | ||
| 7 | <PackageVersion Include="xunit.abstractions" Version="2.0.3" /> | ||
| 8 | <PackageVersion Include="xunit.assert" Version="2.4.1" /> | ||
| 9 | <PackageVersion Include="xunit.core" Version="2.4.1" /> | ||
| 10 | <PackageVersion Include="xunit.extensibility.core" Version="2.4.1" /> | ||
| 11 | <PackageVersion Include="xunit.extensibility.execution" Version="2.4.1" /> | ||
| 12 | <PackageVersion Include="xunit.runner.msbuild" Version="2.4.1" /> | ||
| 13 | <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" /> | ||
| 14 | |||
| 15 | <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | ||
| 16 | <PackageVersion Include="Nerdbank.GitVersioning" Version="3.3.37" /> | ||
| 17 | <PackageVersion Include="WixToolset.Dutil" Version="4.0.70" /> | ||
| 18 | <PackageVersion Include="WixToolset.BootstrapperCore.Native" Version="4.0.57" /> | ||
| 19 | </ItemGroup> | ||
| 20 | </Project> | ||
diff --git a/src/burn/Directory.csproj.props b/src/burn/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/burn/Directory.csproj.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/burn/Directory.vcxproj.props b/src/burn/Directory.vcxproj.props deleted file mode 100644 index 63d73b36..00000000 --- a/src/burn/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,118 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <PropertyGroup> | ||
| 23 | <CodeAnalysisRuleSet Condition=" Exists('$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset') ">$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> | ||
| 24 | </PropertyGroup> | ||
| 25 | |||
| 26 | <ItemDefinitionGroup> | ||
| 27 | <ClCompile> | ||
| 28 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 29 | <WarningLevel>Level4</WarningLevel> | ||
| 30 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 31 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0600;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 32 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 33 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 34 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 35 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 36 | <ExceptionHandling>false</ExceptionHandling> | ||
| 37 | <ControlFlowGuard>Guard</ControlFlowGuard> | ||
| 38 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 39 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 40 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 41 | </ClCompile> | ||
| 42 | <ResourceCompile> | ||
| 43 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 44 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 45 | </ResourceCompile> | ||
| 46 | <Lib> | ||
| 47 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 48 | </Lib> | ||
| 49 | <Link> | ||
| 50 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 51 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 52 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 53 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 54 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 55 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 56 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 57 | </Link> | ||
| 58 | </ItemDefinitionGroup> | ||
| 59 | |||
| 60 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 61 | <ClCompile> | ||
| 62 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 63 | </ClCompile> | ||
| 64 | </ItemDefinitionGroup> | ||
| 65 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 66 | <ClCompile> | ||
| 67 | <CallingConvention>CDecl</CallingConvention> | ||
| 68 | </ClCompile> | ||
| 69 | </ItemDefinitionGroup> | ||
| 70 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 71 | <ClCompile> | ||
| 72 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 73 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 74 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 75 | </ClCompile> | ||
| 76 | </ItemDefinitionGroup> | ||
| 77 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 78 | <ClCompile> | ||
| 79 | <Optimization>Disabled</Optimization> | ||
| 80 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 81 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 82 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 83 | </ClCompile> | ||
| 84 | </ItemDefinitionGroup> | ||
| 85 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | ||
| 86 | <ClCompile> | ||
| 87 | <ControlFlowGuard></ControlFlowGuard> | ||
| 88 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 89 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | ||
| 90 | </ClCompile> | ||
| 91 | </ItemDefinitionGroup> | ||
| 92 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 93 | <ClCompile> | ||
| 94 | <Optimization>MinSpace</Optimization> | ||
| 95 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 96 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 97 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 98 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 99 | </ClCompile> | ||
| 100 | <Link> | ||
| 101 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 102 | <OptimizeReferences>true</OptimizeReferences> | ||
| 103 | </Link> | ||
| 104 | </ItemDefinitionGroup> | ||
| 105 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | ||
| 106 | <ClCompile> | ||
| 107 | <ControlFlowGuard></ControlFlowGuard> | ||
| 108 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 109 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | ||
| 110 | </ClCompile> | ||
| 111 | </ItemDefinitionGroup> | ||
| 112 | <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' "> | ||
| 113 | <Link> | ||
| 114 | <KeyFile>$(LinkKeyFile)</KeyFile> | ||
| 115 | <DelaySign>$(LinkDelaySign)</DelaySign> | ||
| 116 | </Link> | ||
| 117 | </ItemDefinitionGroup> | ||
| 118 | </Project> | ||
diff --git a/src/burn/NativeMultiTargeting.Build.props b/src/burn/NativeMultiTargeting.Build.props deleted file mode 100644 index 1ff46559..00000000 --- a/src/burn/NativeMultiTargeting.Build.props +++ /dev/null | |||
| @@ -1,10 +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 | <!-- Overrides the standard Cpp.Build.props to include the PlatformToolset in the output path. --> | ||
| 6 | <PropertyGroup> | ||
| 7 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\</IntDir> | ||
| 8 | <OutDir>$(OutputPath)$(PlatformToolset)\$(PlatformTarget)\</OutDir> | ||
| 9 | </PropertyGroup> | ||
| 10 | </Project> | ||
diff --git a/src/burn/appveyor.cmd b/src/burn/appveyor.cmd deleted file mode 100644 index a35e10d5..00000000 --- a/src/burn/appveyor.cmd +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | nuget restore || exit /b | ||
| 7 | |||
| 8 | msbuild -t:Test -p:Configuration=%_C% src\test\BurnUnitTest || exit /b | ||
| 9 | |||
| 10 | msbuild -p:Configuration=%_C%;Platform=x86 || exit /b | ||
| 11 | msbuild -p:Configuration=%_C%;Platform=x64 || exit /b | ||
| 12 | msbuild -p:Configuration=%_C%;Platform=arm64 || exit /b | ||
| 13 | |||
| 14 | msbuild -p:Configuration=%_C% -t:PackNative src\stub\stub.vcxproj || exit /b | ||
| 15 | |||
| 16 | @popd | ||
| 17 | @endlocal \ No newline at end of file | ||
diff --git a/src/burn/appveyor.yml b/src/burn/appveyor.yml deleted file mode 100644 index 364569cf..00000000 --- a/src/burn/appveyor.yml +++ /dev/null | |||
| @@ -1,44 +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 | test: off | ||
| 25 | |||
| 26 | pull_requests: | ||
| 27 | do_not_increment_build_number: true | ||
| 28 | |||
| 29 | nuget: | ||
| 30 | disable_publish_on_pr: true | ||
| 31 | |||
| 32 | skip_branch_with_pr: true | ||
| 33 | skip_tags: true | ||
| 34 | |||
| 35 | artifacts: | ||
| 36 | - path: build\Release\**\*.nupkg | ||
| 37 | name: nuget | ||
| 38 | - path: build\Release\**\*.snupkg | ||
| 39 | name: snupkg | ||
| 40 | |||
| 41 | notifications: | ||
| 42 | - provider: Slack | ||
| 43 | incoming_webhook: | ||
| 44 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/burn/burn.cmd b/src/burn/burn.cmd new file mode 100644 index 00000000..1eb09b99 --- /dev/null +++ b/src/burn/burn.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 burn %_C% | ||
| 10 | |||
| 11 | :: burn | ||
| 12 | |||
| 13 | nuget restore || exit /b | ||
| 14 | |||
| 15 | msbuild -t:Test -p:Configuration=%_C% test\BurnUnitTest || exit /b | ||
| 16 | |||
| 17 | msbuild -t:Build -p:Configuration=%_C%;Platform=x86 || exit /b | ||
| 18 | msbuild -t:Build -p:Configuration=%_C%;Platform=x64 || exit /b | ||
| 19 | msbuild -t:Build -p:Configuration=%_C%;Platform=arm64 || exit /b | ||
| 20 | |||
| 21 | msbuild -t:PackNative -p:Configuration=%_C% stub\stub.vcxproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/burn/burn.sln b/src/burn/burn.sln index 6a64b8f0..95d8c511 100644 --- a/src/burn/burn.sln +++ b/src/burn/burn.sln | |||
| @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30711.63 | 4 | VisualStudioVersion = 16.0.30711.63 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "src\engine\engine.vcxproj", "{8119537D-E1D9-6591-D51A-49768A2F9C37}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcxproj", "{8119537D-E1D9-6591-D51A-49768A2F9C37}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stub", "src\stub\stub.vcxproj", "{C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}" | 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stub", "stub\stub.vcxproj", "{C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BurnUnitTest", "src\test\BurnUnitTest\BurnUnitTest.vcxproj", "{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}" | 10 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BurnUnitTest", "test\BurnUnitTest\BurnUnitTest.vcxproj", "{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Global | 12 | Global |
| 13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj index b3a0f81b..0062df8c 100644 --- a/src/burn/engine/engine.vcxproj +++ b/src/burn/engine/engine.vcxproj | |||
| @@ -2,9 +2,6 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
| 6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" /> | ||
| 7 | |||
| 8 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 9 | <ProjectConfiguration Include="Debug|Win32"> | 6 | <ProjectConfiguration Include="Debug|Win32"> |
| 10 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -45,7 +42,7 @@ | |||
| 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 46 | 43 | ||
| 47 | <PropertyGroup> | 44 | <PropertyGroup> |
| 48 | <ProjectAdditionalIncludeDirectories Condition=" '$(DirectReference)'=='true' ">$(ProjectDir)..\..\..\balutil\src\WixToolset.BootstrapperCore.Native\inc;$(ProjectAdditionalIncludeDirectories)</ProjectAdditionalIncludeDirectories> | 45 | <ProjectAdditionalIncludeDirectories>..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;$(ProjectAdditionalIncludeDirectories)</ProjectAdditionalIncludeDirectories> |
| 49 | </PropertyGroup> | 46 | </PropertyGroup> |
| 50 | 47 | ||
| 51 | <ImportGroup Label="ExtensionSettings"> | 48 | <ImportGroup Label="ExtensionSettings"> |
| @@ -97,13 +94,14 @@ | |||
| 97 | <ClCompile Include="variable.cpp" /> | 94 | <ClCompile Include="variable.cpp" /> |
| 98 | <ClCompile Include="variant.cpp" /> | 95 | <ClCompile Include="variant.cpp" /> |
| 99 | </ItemGroup> | 96 | </ItemGroup> |
| 97 | |||
| 100 | <ItemGroup> | 98 | <ItemGroup> |
| 101 | <ClInclude Include="apply.h" /> | 99 | <ClInclude Include="apply.h" /> |
| 102 | <ClInclude Include="approvedexe.h" /> | 100 | <ClInclude Include="approvedexe.h" /> |
| 103 | <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BootstrapperApplication.h" /> | 101 | <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BootstrapperApplication.h" /> |
| 104 | <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BootstrapperEngine.h" /> | 102 | <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BootstrapperEngine.h" /> |
| 105 | <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BundleExtension.h" /> | 103 | <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BundleExtension.h" /> |
| 106 | <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BundleExtensionEngine.h" /> | 104 | <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BundleExtensionEngine.h" /> |
| 107 | <ClInclude Include="burnextension.h" /> | 105 | <ClInclude Include="burnextension.h" /> |
| 108 | <ClInclude Include="cabextract.h" /> | 106 | <ClInclude Include="cabextract.h" /> |
| 109 | <ClInclude Include="cache.h" /> | 107 | <ClInclude Include="cache.h" /> |
| @@ -144,9 +142,6 @@ | |||
| 144 | <ClInclude Include="variable.h" /> | 142 | <ClInclude Include="variable.h" /> |
| 145 | <ClInclude Include="variant.h" /> | 143 | <ClInclude Include="variant.h" /> |
| 146 | </ItemGroup> | 144 | </ItemGroup> |
| 147 | <ItemGroup> | ||
| 148 | <None Include="packages.config" /> | ||
| 149 | </ItemGroup> | ||
| 150 | 145 | ||
| 151 | <ItemGroup> | 146 | <ItemGroup> |
| 152 | <CustomBuild Include="engine.mc"> | 147 | <CustomBuild Include="engine.mc"> |
| @@ -157,12 +152,12 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command> | |||
| 157 | </CustomBuild> | 152 | </CustomBuild> |
| 158 | </ItemGroup> | 153 | </ItemGroup> |
| 159 | 154 | ||
| 160 | <Target Name="SetWixVersion" DependsOnTargets="GetBuildVersion" BeforeTargets="ClCompile"> | 155 | <Target Name="SetWixVersion" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="ClCompile"> |
| 161 | <PropertyGroup> | 156 | <PropertyGroup> |
| 162 | <rmj>$(MajorMinorVersion.Split(`.`)[0])</rmj> | 157 | <rmj>$(GitBaseVersionMajor)</rmj> |
| 163 | <rmm>$(MajorMinorVersion.Split(`.`)[1])</rmm> | 158 | <rmm>$(GitBaseVersionMinor)</rmm> |
| 164 | <rup>0</rup> | 159 | <rup>$(GitBaseVersionPatch)</rup> |
| 165 | <rpr>$(BuildNumber)</rpr> | 160 | <rpr>$(GitCommits)</rpr> |
| 166 | <szVerMajorMinorBuild>$(rmj).$(rmm).$(rup).$(rpr)</szVerMajorMinorBuild> | 161 | <szVerMajorMinorBuild>$(rmj).$(rmm).$(rup).$(rpr)</szVerMajorMinorBuild> |
| 167 | <wixver>rmj=$(rmj);rmm=$(rmm);rup=$(rup);rpr=$(rpr);szVerMajorMinorBuild="$(szVerMajorMinorBuild)"</wixver> | 162 | <wixver>rmj=$(rmj);rmm=$(rmm);rup=$(rup);rpr=$(rpr);szVerMajorMinorBuild="$(szVerMajorMinorBuild)"</wixver> |
| 168 | </PropertyGroup> | 163 | </PropertyGroup> |
| @@ -173,14 +168,13 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command> | |||
| 173 | </ClCompile> | 168 | </ClCompile> |
| 174 | </ItemGroup> | 169 | </ItemGroup> |
| 175 | </Target> | 170 | </Target> |
| 171 | |||
| 172 | <ItemGroup> | ||
| 173 | <PackageReference Include="WixToolset.DUtil" /> | ||
| 174 | |||
| 175 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 176 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 177 | </ItemGroup> | ||
| 178 | |||
| 176 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 179 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 177 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
| 178 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 179 | <PropertyGroup> | ||
| 180 | <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> | ||
| 181 | </PropertyGroup> | ||
| 182 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 183 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props'))" /> | ||
| 184 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 185 | </Target> | ||
| 186 | </Project> | 180 | </Project> |
diff --git a/src/burn/engine/packages.config b/src/burn/engine/packages.config deleted file mode 100644 index 7219a3da..00000000 --- a/src/burn/engine/packages.config +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 5 | </packages> \ No newline at end of file | ||
diff --git a/src/burn/nuget.config b/src/burn/nuget.config deleted file mode 100644 index 237c522e..00000000 --- a/src/burn/nuget.config +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 6 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 7 | <add key="wixtoolset-balutil" value="https://ci.appveyor.com/nuget/wixtoolset-balutil" /> | ||
| 8 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 9 | </packageSources> | ||
| 10 | </configuration> | ||
diff --git a/src/burn/stub/packages.config b/src/burn/stub/packages.config deleted file mode 100644 index a98c0c8e..00000000 --- a/src/burn/stub/packages.config +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 7 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 8 | </packages> \ No newline at end of file | ||
diff --git a/src/burn/stub/stub.nuspec b/src/burn/stub/stub.nuspec index 968feff3..01f12515 100644 --- a/src/burn/stub/stub.nuspec +++ b/src/burn/stub/stub.nuspec | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | </metadata> | 14 | </metadata> |
| 15 | 15 | ||
| 16 | <files> | 16 | <files> |
| 17 | <file src="$projectFolder$$id$.props" target="buildTransitive" /> | 17 | <file src="$projectFolder$\$id$.props" target="buildTransitive" /> |
| 18 | <file src="..\..\build\$configuration$\Win32\burn.exe" target="tools\x86" /> | 18 | <file src="..\x86\burn.exe" target="tools\x86" /> |
| 19 | <file src="..\..\build\$configuration$\Win32\burn.pdb" target="tools\x86" /> | 19 | <file src="..\x86\burn.pdb" target="tools\x86" /> |
| 20 | <file src="..\..\build\$configuration$\x64\burn.exe" target="tools\x64" /> | 20 | <file src="..\x64\burn.exe" target="tools\x64" /> |
| 21 | <file src="..\..\build\$configuration$\x64\burn.pdb" target="tools\x64" /> | 21 | <file src="..\x64\burn.pdb" target="tools\x64" /> |
| 22 | <file src="..\..\build\$configuration$\arm64\burn.exe" target="tools\arm64" /> | 22 | <file src="..\arm64\burn.exe" target="tools\arm64" /> |
| 23 | <file src="..\..\build\$configuration$\arm64\burn.pdb" target="tools\arm64" /> | 23 | <file src="..\arm64\burn.pdb" target="tools\arm64" /> |
| 24 | </files> | 24 | </files> |
| 25 | </package> | 25 | </package> |
diff --git a/src/burn/stub/stub.vcxproj b/src/burn/stub/stub.vcxproj index 97972848..b75f17f4 100644 --- a/src/burn/stub/stub.vcxproj +++ b/src/burn/stub/stub.vcxproj | |||
| @@ -2,11 +2,6 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 6 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> | ||
| 7 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | ||
| 8 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | ||
| 9 | |||
| 10 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 11 | <ProjectConfiguration Include="Debug|Win32"> | 6 | <ProjectConfiguration Include="Debug|Win32"> |
| 12 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -57,10 +52,6 @@ | |||
| 57 | </ImportGroup> | 52 | </ImportGroup> |
| 58 | 53 | ||
| 59 | <ImportGroup Label="Shared"> | 54 | <ImportGroup Label="Shared"> |
| 60 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" /> | ||
| 61 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" /> | ||
| 62 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" /> | ||
| 63 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
| 64 | </ImportGroup> | 55 | </ImportGroup> |
| 65 | 56 | ||
| 66 | <PropertyGroup> | 57 | <PropertyGroup> |
| @@ -100,21 +91,11 @@ | |||
| 100 | </ItemGroup> | 91 | </ItemGroup> |
| 101 | 92 | ||
| 102 | <ItemGroup> | 93 | <ItemGroup> |
| 103 | <None Include="packages.config" /> | 94 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 95 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 96 | |||
| 97 | <PackageReference Include="WixToolset.DUtil" /> | ||
| 104 | </ItemGroup> | 98 | </ItemGroup> |
| 105 | 99 | ||
| 106 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 100 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 107 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 108 | <PropertyGroup> | ||
| 109 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText> | ||
| 110 | </PropertyGroup> | ||
| 111 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" /> | ||
| 112 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" /> | ||
| 113 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" /> | ||
| 114 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" /> | ||
| 115 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> | ||
| 116 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | ||
| 117 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 118 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 119 | </Target> | ||
| 120 | </Project> | 101 | </Project> |
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj index 33c8ed6c..7ee27258 100644 --- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | |||
| @@ -2,9 +2,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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" /> |
| 6 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" /> | 6 | |
| 7 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" /> | ||
| 8 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
| 9 | <ProjectConfiguration Include="Debug|ARM64"> | 8 | <ProjectConfiguration Include="Debug|ARM64"> |
| 10 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
| @@ -30,6 +29,7 @@ | |||
| 30 | <RootNamespace>UnitTest</RootNamespace> | 29 | <RootNamespace>UnitTest</RootNamespace> |
| 31 | <Keyword>ManagedCProj</Keyword> | 30 | <Keyword>ManagedCProj</Keyword> |
| 32 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 31 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 32 | <PlatformToolset>v142</PlatformToolset> | ||
| 33 | <CharacterSet>Unicode</CharacterSet> | 33 | <CharacterSet>Unicode</CharacterSet> |
| 34 | <CLRSupport>true</CLRSupport> | 34 | <CLRSupport>true</CLRSupport> |
| 35 | <SignOutput>false</SignOutput> | 35 | <SignOutput>false</SignOutput> |
| @@ -39,9 +39,8 @@ | |||
| 39 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 39 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 40 | 40 | ||
| 41 | <PropertyGroup> | 41 | <PropertyGroup> |
| 42 | <ProjectAdditionalIncludeDirectories Condition=" '$(DirectReference)'=='true' ">$(ProjectDir)..\..\..\..\balutil\src\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> | 42 | <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);..\..\engine;..\..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories> |
| 43 | <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);..\..\engine</ProjectAdditionalIncludeDirectories> | 43 | <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries> |
| 44 | <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries> | ||
| 45 | </PropertyGroup> | 44 | </PropertyGroup> |
| 46 | 45 | ||
| 47 | <ItemGroup> | 46 | <ItemGroup> |
| @@ -70,40 +69,25 @@ | |||
| 70 | <ClInclude Include="precomp.h" /> | 69 | <ClInclude Include="precomp.h" /> |
| 71 | <ClInclude Include="VariableHelpers.h" /> | 70 | <ClInclude Include="VariableHelpers.h" /> |
| 72 | </ItemGroup> | 71 | </ItemGroup> |
| 72 | |||
| 73 | <ItemGroup> | 73 | <ItemGroup> |
| 74 | <None Include="packages.config" /> | 74 | <None Include="packages.config" /> |
| 75 | <ResourceCompile Include="BurnUnitTest.rc" /> | 75 | <ResourceCompile Include="BurnUnitTest.rc" /> |
| 76 | </ItemGroup> | 76 | </ItemGroup> |
| 77 | |||
| 77 | <ItemGroup> | 78 | <ItemGroup> |
| 78 | <None Include="TestData\CacheTest\CacheSignatureTest.File" CopyToOutputDirectory="PreserveNewest" /> | 79 | <None Include="TestData\CacheTest\CacheSignatureTest.File" CopyToOutputDirectory="PreserveNewest" /> |
| 79 | <None Include="TestData\PlanTest\BasicFunctionality_BundleA_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> | 80 | <None Include="TestData\PlanTest\BasicFunctionality_BundleA_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> |
| 80 | <None Include="TestData\PlanTest\MsiTransaction_BundleAv1_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> | 81 | <None Include="TestData\PlanTest\MsiTransaction_BundleAv1_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> |
| 81 | <None Include="TestData\PlanTest\Slipstream_BundleA_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> | 82 | <None Include="TestData\PlanTest\Slipstream_BundleA_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> |
| 82 | </ItemGroup> | 83 | </ItemGroup> |
| 83 | <ItemGroup> | 84 | |
| 84 | <Reference Include="System" /> | ||
| 85 | <Reference Include="System.Core" /> | ||
| 86 | <Reference Include="WixBuildTools.TestSupport"> | ||
| 87 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath> | ||
| 88 | </Reference> | ||
| 89 | <Reference Include="WixBuildTools.TestSupport.Native"> | ||
| 90 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> | ||
| 91 | </Reference> | ||
| 92 | </ItemGroup> | ||
| 93 | <ItemGroup> | 85 | <ItemGroup> |
| 94 | <ProjectReference Include="..\..\engine\engine.vcxproj"> | 86 | <ProjectReference Include="..\..\engine\engine.vcxproj"> |
| 95 | <Project>{8119537D-E1D9-6591-D51A-49770A2F9C37}</Project> | 87 | <Project>{8119537D-E1D9-6591-D51A-49770A2F9C37}</Project> |
| 96 | </ProjectReference> | 88 | </ProjectReference> |
| 97 | </ItemGroup> | 89 | </ItemGroup> |
| 90 | |||
| 98 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 91 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 99 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" /> | 92 | <Import Project="..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" /> |
| 100 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 101 | <PropertyGroup> | ||
| 102 | <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> | ||
| 103 | </PropertyGroup> | ||
| 104 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props'))" /> | ||
| 105 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets'))" /> | ||
| 106 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props'))" /> | ||
| 107 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 108 | </Target> | ||
| 109 | </Project> | 93 | </Project> |
diff --git a/src/burn/test/BurnUnitTest/PlanTest.cpp b/src/burn/test/BurnUnitTest/PlanTest.cpp index a7c1d83c..001acaee 100644 --- a/src/burn/test/BurnUnitTest/PlanTest.cpp +++ b/src/burn/test/BurnUnitTest/PlanTest.cpp | |||
| @@ -33,7 +33,7 @@ namespace Bootstrapper | |||
| 33 | { | 33 | { |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | [Fact] | 36 | [Fact(Skip = "Disable due to hang on CI")] |
| 37 | void MsiTransactionInstallTest() | 37 | void MsiTransactionInstallTest() |
| 38 | { | 38 | { |
| 39 | HRESULT hr = S_OK; | 39 | HRESULT hr = S_OK; |
| @@ -165,7 +165,7 @@ namespace Bootstrapper | |||
| 165 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[2], L"PackageC", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_PRESENT); | 165 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[2], L"PackageC", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_PRESENT); |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | [Fact] | 168 | [Fact(Skip = "Disable due to hang on CI")] |
| 169 | void MsiTransactionUninstallTest() | 169 | void MsiTransactionUninstallTest() |
| 170 | { | 170 | { |
| 171 | HRESULT hr = S_OK; | 171 | HRESULT hr = S_OK; |
| @@ -274,7 +274,7 @@ namespace Bootstrapper | |||
| 274 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[2], L"PackageC", BURN_PACKAGE_REGISTRATION_STATE_ABSENT, BURN_PACKAGE_REGISTRATION_STATE_ABSENT); | 274 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[2], L"PackageC", BURN_PACKAGE_REGISTRATION_STATE_ABSENT, BURN_PACKAGE_REGISTRATION_STATE_ABSENT); |
| 275 | } | 275 | } |
| 276 | 276 | ||
| 277 | [Fact] | 277 | [Fact(Skip = "Disable due to hang on CI")] |
| 278 | void RelatedBundleMissingFromCacheTest() | 278 | void RelatedBundleMissingFromCacheTest() |
| 279 | { | 279 | { |
| 280 | HRESULT hr = S_OK; | 280 | HRESULT hr = S_OK; |
| @@ -356,7 +356,7 @@ namespace Bootstrapper | |||
| 356 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_PRESENT); | 356 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_PRESENT); |
| 357 | } | 357 | } |
| 358 | 358 | ||
| 359 | [Fact] | 359 | [Fact(Skip = "Disable due to hang on CI")] |
| 360 | void SingleMsiCacheTest() | 360 | void SingleMsiCacheTest() |
| 361 | { | 361 | { |
| 362 | HRESULT hr = S_OK; | 362 | HRESULT hr = S_OK; |
| @@ -425,7 +425,7 @@ namespace Bootstrapper | |||
| 425 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_ABSENT); | 425 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_ABSENT); |
| 426 | } | 426 | } |
| 427 | 427 | ||
| 428 | [Fact] | 428 | [Fact(Skip = "Disable due to hang on CI")] |
| 429 | void SingleMsiInstallTest() | 429 | void SingleMsiInstallTest() |
| 430 | { | 430 | { |
| 431 | HRESULT hr = S_OK; | 431 | HRESULT hr = S_OK; |
| @@ -508,7 +508,7 @@ namespace Bootstrapper | |||
| 508 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_PRESENT); | 508 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_PRESENT); |
| 509 | } | 509 | } |
| 510 | 510 | ||
| 511 | [Fact] | 511 | [Fact(Skip = "Disable due to hang on CI")] |
| 512 | void SingleMsiInstalledWithNoInstalledPackagesModifyTest() | 512 | void SingleMsiInstalledWithNoInstalledPackagesModifyTest() |
| 513 | { | 513 | { |
| 514 | HRESULT hr = S_OK; | 514 | HRESULT hr = S_OK; |
| @@ -568,7 +568,7 @@ namespace Bootstrapper | |||
| 568 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_ABSENT, BURN_PACKAGE_REGISTRATION_STATE_ABSENT); | 568 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_ABSENT, BURN_PACKAGE_REGISTRATION_STATE_ABSENT); |
| 569 | } | 569 | } |
| 570 | 570 | ||
| 571 | [Fact] | 571 | [Fact(Skip = "Disable due to hang on CI")] |
| 572 | void SingleMsiUninstallTest() | 572 | void SingleMsiUninstallTest() |
| 573 | { | 573 | { |
| 574 | HRESULT hr = S_OK; | 574 | HRESULT hr = S_OK; |
| @@ -641,7 +641,7 @@ namespace Bootstrapper | |||
| 641 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_ABSENT, BURN_PACKAGE_REGISTRATION_STATE_ABSENT); | 641 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_ABSENT, BURN_PACKAGE_REGISTRATION_STATE_ABSENT); |
| 642 | } | 642 | } |
| 643 | 643 | ||
| 644 | [Fact] | 644 | [Fact(Skip = "Disable due to hang on CI")] |
| 645 | void SingleMsiUninstallTestFromUpgradeBundleWithSameExactPackage() | 645 | void SingleMsiUninstallTestFromUpgradeBundleWithSameExactPackage() |
| 646 | { | 646 | { |
| 647 | HRESULT hr = S_OK; | 647 | HRESULT hr = S_OK; |
| @@ -704,7 +704,7 @@ namespace Bootstrapper | |||
| 704 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_IGNORED, BURN_PACKAGE_REGISTRATION_STATE_IGNORED); | 704 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[0], L"PackageA", BURN_PACKAGE_REGISTRATION_STATE_IGNORED, BURN_PACKAGE_REGISTRATION_STATE_IGNORED); |
| 705 | } | 705 | } |
| 706 | 706 | ||
| 707 | [Fact] | 707 | [Fact(Skip = "Disable due to hang on CI")] |
| 708 | void SlipstreamInstallTest() | 708 | void SlipstreamInstallTest() |
| 709 | { | 709 | { |
| 710 | HRESULT hr = S_OK; | 710 | HRESULT hr = S_OK; |
| @@ -808,7 +808,7 @@ namespace Bootstrapper | |||
| 808 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[2], L"PatchA", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_PRESENT); | 808 | ValidateNonPermanentPackageExpectedStates(&pEngineState->packages.rgPackages[2], L"PatchA", BURN_PACKAGE_REGISTRATION_STATE_PRESENT, BURN_PACKAGE_REGISTRATION_STATE_PRESENT); |
| 809 | } | 809 | } |
| 810 | 810 | ||
| 811 | [Fact] | 811 | [Fact(Skip = "Disable due to hang on CI")] |
| 812 | void SlipstreamUninstallTest() | 812 | void SlipstreamUninstallTest() |
| 813 | { | 813 | { |
| 814 | HRESULT hr = S_OK; | 814 | HRESULT hr = S_OK; |
diff --git a/src/burn/test/BurnUnitTest/packages.config b/src/burn/test/BurnUnitTest/packages.config deleted file mode 100644 index 1d36c387..00000000 --- a/src/burn/test/BurnUnitTest/packages.config +++ /dev/null | |||
| @@ -1,15 +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 | <packages> | ||
| 4 | <package id="WixBuildTools.TestSupport" version="4.0.47" /> | ||
| 5 | <package id="WixBuildTools.TestSupport.Native" version="4.0.47" /> | ||
| 6 | <package id="WixToolset.DUtil" version="4.0.70" targetFramework="native" /> | ||
| 7 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.57" targetFramework="native" /> | ||
| 8 | <package id="xunit.abstractions" version="2.0.3" /> | ||
| 9 | <package id="xunit.assert" version="2.4.1" /> | ||
| 10 | <package id="xunit.core" version="2.4.1" /> | ||
| 11 | <package id="xunit.extensibility.core" version="2.4.1" /> | ||
| 12 | <package id="xunit.extensibility.execution" version="2.4.1" /> | ||
| 13 | <package id="xunit.runner.msbuild" version="2.4.1" /> | ||
| 14 | <package id="xunit.runner.visualstudio" version="2.4.1" /> | ||
| 15 | </packages> \ No newline at end of file | ||
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 | ||
diff --git a/src/ext/Bal/Bal.wixext.sln b/src/ext/Bal/Bal.wixext.sln index 0b4c5afa..ddf9ef88 100644 --- a/src/ext/Bal/Bal.wixext.sln +++ b/src/ext/Bal/Bal.wixext.sln | |||
| @@ -5,37 +5,37 @@ VisualStudioVersion = 16.0.29503.13 | |||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}" | 6 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "src\Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}" | 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "src\mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}" | 10 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "src\wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}" | 12 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "src\wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}" | 14 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}" |
| 15 | EndProject | 15 | EndProject |
| 16 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "src\wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" | 16 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" |
| 17 | EndProject | 17 | EndProject |
| 18 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dnc.Host", "src\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj", "{0D780900-C2FF-4FA2-8CB5-8A19768724C5}" | 18 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dnc.Host", "WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj", "{0D780900-C2FF-4FA2-8CB5-8A19768724C5}" |
| 19 | EndProject | 19 | EndProject |
| 20 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" | 20 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" |
| 21 | EndProject | 21 | EndProject |
| 22 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}" | 22 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework2MBA", "test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}" |
| 23 | EndProject | 23 | EndProject |
| 24 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "src\test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}" | 24 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}" |
| 25 | EndProject | 25 | EndProject |
| 26 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ManagedHost", "src\test\WixToolsetTest.ManagedHost\WixToolsetTest.ManagedHost.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" | 26 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ManagedHost", "test\WixToolsetTest.ManagedHost\WixToolsetTest.ManagedHost.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" |
| 27 | EndProject | 27 | EndProject |
| 28 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", "src\test\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj", "{44297646-706D-4508-8E96-1B35B109694C}" | 28 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", "test\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj", "{44297646-706D-4508-8E96-1B35B109694C}" |
| 29 | EndProject | 29 | EndProject |
| 30 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}" | 30 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}" |
| 31 | EndProject | 31 | EndProject |
| 32 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.EarliestCoreMBA", "src\test\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj", "{1E86D8DF-DABD-4B6E-A812-64CD2040C73A}" | 32 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.EarliestCoreMBA", "test\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj", "{1E86D8DF-DABD-4B6E-A812-64CD2040C73A}" |
| 33 | EndProject | 33 | EndProject |
| 34 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnchost", "src\dnchost\dnchost.vcxproj", "{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}" | 34 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnchost", "dnchost\dnchost.vcxproj", "{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}" |
| 35 | EndProject | 35 | EndProject |
| 36 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.LatestCoreMBA", "src\test\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj", "{A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}" | 36 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.LatestCoreMBA", "test\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj", "{A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}" |
| 37 | EndProject | 37 | EndProject |
| 38 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.WPFCoreMBA", "src\test\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj", "{8E707BF2-FD72-4649-8727-BA5955D48D40}" | 38 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.WPFCoreMBA", "test\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj", "{8E707BF2-FD72-4649-8727-BA5955D48D40}" |
| 39 | EndProject | 39 | EndProject |
| 40 | Global | 40 | Global |
| 41 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 41 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/Bal/CSharp.Build.props b/src/ext/Bal/CSharp.Build.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/Bal/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/ext/Bal/Cpp.Build.props b/src/ext/Bal/Cpp.Build.props deleted file mode 100644 index e7bba117..00000000 --- a/src/ext/Bal/Cpp.Build.props +++ /dev/null | |||
| @@ -1,94 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | </PropertyGroup> | ||
| 14 | |||
| 15 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 16 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 17 | </PropertyGroup> | ||
| 18 | |||
| 19 | <PropertyGroup> | ||
| 20 | <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> | ||
| 21 | </PropertyGroup> | ||
| 22 | |||
| 23 | <ItemDefinitionGroup> | ||
| 24 | <ClCompile> | ||
| 25 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 26 | <WarningLevel>Level4</WarningLevel> | ||
| 27 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 28 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 29 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 30 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 31 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 32 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 33 | <ExceptionHandling>false</ExceptionHandling> | ||
| 34 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 35 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 36 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 37 | </ClCompile> | ||
| 38 | <ResourceCompile> | ||
| 39 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 40 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 41 | </ResourceCompile> | ||
| 42 | <Lib> | ||
| 43 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 44 | </Lib> | ||
| 45 | <Link> | ||
| 46 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 47 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 48 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 49 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 50 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 51 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 52 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 53 | </Link> | ||
| 54 | </ItemDefinitionGroup> | ||
| 55 | |||
| 56 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 57 | <ClCompile> | ||
| 58 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 59 | </ClCompile> | ||
| 60 | </ItemDefinitionGroup> | ||
| 61 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 62 | <ClCompile> | ||
| 63 | <CallingConvention>CDecl</CallingConvention> | ||
| 64 | </ClCompile> | ||
| 65 | </ItemDefinitionGroup> | ||
| 66 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 67 | <ClCompile> | ||
| 68 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 69 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 70 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 71 | </ClCompile> | ||
| 72 | </ItemDefinitionGroup> | ||
| 73 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 74 | <ClCompile> | ||
| 75 | <Optimization>Disabled</Optimization> | ||
| 76 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 77 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 78 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 79 | </ClCompile> | ||
| 80 | </ItemDefinitionGroup> | ||
| 81 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 82 | <ClCompile> | ||
| 83 | <Optimization>MinSpace</Optimization> | ||
| 84 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 85 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 86 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 87 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 88 | </ClCompile> | ||
| 89 | <Link> | ||
| 90 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 91 | <OptimizeReferences>true</OptimizeReferences> | ||
| 92 | </Link> | ||
| 93 | </ItemDefinitionGroup> | ||
| 94 | </Project> | ||
diff --git a/src/ext/Bal/Custom.Build.props b/src/ext/Bal/Custom.Build.props deleted file mode 100644 index 66e74d81..00000000 --- a/src/ext/Bal/Custom.Build.props +++ /dev/null | |||
| @@ -1,11 +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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 5 | <PropertyGroup Condition="$(ProjectName.StartsWith('Example.')) And '$(MSBuildProjectExtension)'=='.csproj' "> | ||
| 6 | <OutputPath>$(OutputPath)examples\$(ProjectName)\</OutputPath> | ||
| 7 | </PropertyGroup> | ||
| 8 | <PropertyGroup Condition="$(ProjectName.StartsWith('Example.')) And '$(MSBuildProjectExtension)'=='.vcxproj' "> | ||
| 9 | <OutDir>$(OutDir)examples\$(ProjectName)\</OutDir> | ||
| 10 | </PropertyGroup> | ||
| 11 | </Project> | ||
diff --git a/src/ext/Bal/Directory.Build.props b/src/ext/Bal/Directory.Build.props index f83cc154..ee59ca34 100644 --- a/src/ext/Bal/Directory.Build.props +++ b/src/ext/Bal/Directory.Build.props | |||
| @@ -1,29 +1,17 @@ | |||
| 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>Bal.wixext</SegmentName> |
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | 7 | </PropertyGroup> |
| 11 | <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages> | ||
| 12 | 8 | ||
| 13 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | 9 | <Import Project="..\..\Directory.Build.props" /> |
| 14 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | ||
| 15 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | ||
| 16 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | ||
| 17 | 10 | ||
| 18 | <Authors>WiX Toolset Team</Authors> | 11 | <PropertyGroup Condition="$(ProjectName.StartsWith('Example.')) And '$(MSBuildProjectExtension)'=='.csproj' "> |
| 19 | <Company>WiX Toolset</Company> | 12 | <OutputPath>$(OutputPath)examples\$(ProjectName)\</OutputPath> |
| 20 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | 13 | </PropertyGroup> |
| 21 | <PackageLicenseExpression>MS-RL</PackageLicenseExpression> | 14 | <PropertyGroup Condition="$(ProjectName.StartsWith('Example.')) And '$(MSBuildProjectExtension)'=='.vcxproj' "> |
| 22 | <Product>WiX Toolset</Product> | 15 | <OutDir>$(OutDir)examples\$(ProjectName)\</OutDir> |
| 23 | </PropertyGroup> | 16 | </PropertyGroup> |
| 24 | |||
| 25 | <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.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> | 17 | </Project> |
diff --git a/src/ext/Bal/Directory.Build.targets b/src/ext/Bal/Directory.Build.targets deleted file mode 100644 index cb988931..00000000 --- a/src/ext/Bal/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/ext/Bal/Samples/bafunctions/bafunctions.vcxproj b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj index 640c812d..6aac6943 100644 --- a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj | |||
| @@ -1,11 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | 3 | ||
| 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" /> | ||
| 6 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
| 7 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 8 | |||
| 9 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 10 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 11 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -64,18 +60,13 @@ | |||
| 64 | </ItemGroup> | 60 | </ItemGroup> |
| 65 | 61 | ||
| 66 | <ItemGroup> | 62 | <ItemGroup> |
| 67 | <None Include="packages.config" /> | 63 | <PackageReference Include="WixToolset.Dutil" /> |
| 64 | <PackageReference Include="WixToolset.BalUtil" /> | ||
| 65 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 66 | |||
| 67 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 68 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 68 | </ItemGroup> | 69 | </ItemGroup> |
| 69 | 70 | ||
| 70 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 71 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 71 | <Import Project="..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
| 72 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 73 | <PropertyGroup> | ||
| 74 | <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> | ||
| 75 | </PropertyGroup> | ||
| 76 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props'))" /> | ||
| 77 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 78 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 79 | <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 80 | </Target> | ||
| 81 | </Project> | 72 | </Project> |
diff --git a/src/ext/Bal/Samples/bafunctions/packages.config b/src/ext/Bal/Samples/bafunctions/packages.config deleted file mode 100644 index 548ddb48..00000000 --- a/src/ext/Bal/Samples/bafunctions/packages.config +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
| 5 | <package id="WixToolset.BalUtil" version="4.0.58" targetFramework="native" /> | ||
| 6 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 7 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj index f347ca0b..a2f0d8ec 100644 --- a/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | |||
| @@ -36,9 +36,4 @@ | |||
| 36 | <FileWrites Include="@(HeaderPath)" /> | 36 | <FileWrites Include="@(HeaderPath)" /> |
| 37 | </ItemGroup> | 37 | </ItemGroup> |
| 38 | </Target> | 38 | </Target> |
| 39 | |||
| 40 | <ItemGroup> | ||
| 41 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> | ||
| 42 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
| 43 | </ItemGroup> | ||
| 44 | </Project> | 39 | </Project> |
diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 3ee0ad1e..0bcd523c 100644 --- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | |||
| @@ -15,14 +15,15 @@ | |||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <None Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" /> | 16 | <None Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | |||
| 18 | <ItemGroup> | 19 | <ItemGroup> |
| 19 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 20 | <Reference Include="System.Configuration" /> |
| 20 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 21 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" /> | ||
| 22 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | |||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
| 24 | <Reference Include="System.Configuration" /> | 24 | <PackageReference Include="WixToolset.Mba.Core" /> |
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | |||
| 26 | <ItemGroup> | 27 | <ItemGroup> |
| 27 | <HeaderPath Include="$(BaseOutputPath)obj\$(AssemblyName).h"> | 28 | <HeaderPath Include="$(BaseOutputPath)obj\$(AssemblyName).h"> |
| 28 | <Visible>False</Visible> | 29 | <Visible>False</Visible> |
| @@ -44,11 +45,4 @@ | |||
| 44 | <FileWrites Include="@(HeaderPath)" /> | 45 | <FileWrites Include="@(HeaderPath)" /> |
| 45 | </ItemGroup> | 46 | </ItemGroup> |
| 46 | </Target> | 47 | </Target> |
| 47 | 48 | </Project> | |
| 48 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"> | ||
| 49 | <PropertyGroup> | ||
| 50 | <NuspecBasePath>$(OutputPath)</NuspecBasePath> | ||
| 51 | <NuspecProperties>Id=$(AssemblyName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl)</NuspecProperties> | ||
| 52 | </PropertyGroup> | ||
| 53 | </Target> | ||
| 54 | </Project> \ No newline at end of file | ||
diff --git a/src/ext/Bal/appveyor.cmd b/src/ext/Bal/appveyor.cmd deleted file mode 100644 index f4e9c26e..00000000 --- a/src/ext/Bal/appveyor.cmd +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | |||
| 5 | nuget restore || exit /b | ||
| 6 | |||
| 7 | msbuild -p:Configuration=%_C% -Restore || exit /b | ||
| 8 | msbuild -p:Configuration=%_C% src\test\examples\examples.proj || exit /b | ||
| 9 | |||
| 10 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b | ||
| 11 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b | ||
| 12 | |||
| 13 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b | ||
| 14 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b | ||
| 15 | |||
| 16 | @popd | ||
| 17 | @endlocal | ||
diff --git a/src/ext/Bal/appveyor.yml b/src/ext/Bal/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Bal/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd new file mode 100644 index 00000000..0bc55dfb --- /dev/null +++ b/src/ext/Bal/bal.cmd | |||
| @@ -0,0 +1,36 @@ | |||
| 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 ext\Util %_C% using %_N% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | nuget restore dnchost\packages.config || exit /b | ||
| 13 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 14 | |||
| 15 | :: Build | ||
| 16 | msbuild -p:Configuration=%_C%;Platform=x86 dnchost\dnchost.vcxproj || exit /b | ||
| 17 | msbuild -p:Configuration=%_C%;Platform=x64 dnchost\dnchost.vcxproj || exit /b | ||
| 18 | msbuild -p:Configuration=%_C%;Platform=ARM64 dnchost\dnchost.vcxproj || exit /b | ||
| 19 | |||
| 20 | msbuild -p:Configuration=%_C%;Platform=x86 mbahost\mbahost.vcxproj || exit /b | ||
| 21 | msbuild -p:Configuration=%_C%;Platform=x64 mbahost\mbahost.vcxproj || exit /b | ||
| 22 | msbuild -p:Configuration=%_C%;Platform=ARM64 mbahost\mbahost.vcxproj || exit /b | ||
| 23 | |||
| 24 | msbuild -p:Configuration=%_C% || exit /b | ||
| 25 | msbuild -p:Configuration=%_C% test\examples\examples.proj || exit /b | ||
| 26 | |||
| 27 | :: Test | ||
| 28 | dotnet test -c %_C% --no-build test\WixToolsetTest.Bal || exit /b | ||
| 29 | dotnet test -c %_C% --no-build test\WixToolsetTest.ManagedHost || exit /b | ||
| 30 | |||
| 31 | :: Pack | ||
| 32 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b | ||
| 33 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b | ||
| 34 | |||
| 35 | @popd | ||
| 36 | @endlocal | ||
diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj index bef3f77e..6bc89427 100644 --- a/src/ext/Bal/dnchost/dnchost.vcxproj +++ b/src/ext/Bal/dnchost/dnchost.vcxproj | |||
| @@ -1,12 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | <Project 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\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> | ||
| 5 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | ||
| 6 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | ||
| 7 | <Import Project="..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" /> | ||
| 8 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
| 9 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 10 | <ItemGroup Label="ProjectConfigurations"> | 4 | <ItemGroup Label="ProjectConfigurations"> |
| 11 | <ProjectConfiguration Include="Debug|ARM64"> | 5 | <ProjectConfiguration Include="Debug|ARM64"> |
| 12 | <Configuration>Debug</Configuration> | 6 | <Configuration>Debug</Configuration> |
| @@ -33,6 +27,7 @@ | |||
| 33 | <Platform>x64</Platform> | 27 | <Platform>x64</Platform> |
| 34 | </ProjectConfiguration> | 28 | </ProjectConfiguration> |
| 35 | </ItemGroup> | 29 | </ItemGroup> |
| 30 | |||
| 36 | <PropertyGroup Label="Globals"> | 31 | <PropertyGroup Label="Globals"> |
| 37 | <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid> | 32 | <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid> |
| 38 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 33 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| @@ -41,14 +36,18 @@ | |||
| 41 | <TargetName>dnchost</TargetName> | 36 | <TargetName>dnchost</TargetName> |
| 42 | <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile> | 37 | <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile> |
| 43 | </PropertyGroup> | 38 | </PropertyGroup> |
| 39 | |||
| 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 40 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 41 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 42 | |||
| 46 | <PropertyGroup> | 43 | <PropertyGroup> |
| 47 | <NetHostPlatform>$(Platform)</NetHostPlatform> | 44 | <NetHostPlatform>$(Platform)</NetHostPlatform> |
| 48 | <NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform> | 45 | <NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform> |
| 49 | <NetHostPath>..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\</NetHostPath> | 46 | <NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\</NetHostPath> |
| 47 | <ProjectAdditionalIncludeDirectories>$(BaseOutputPath)obj;$(NetHostPath)</ProjectAdditionalIncludeDirectories> | ||
| 50 | <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries> | 48 | <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries> |
| 51 | </PropertyGroup> | 49 | </PropertyGroup> |
| 50 | |||
| 52 | <ItemGroup> | 51 | <ItemGroup> |
| 53 | <ClCompile Include="dnchost.cpp" /> | 52 | <ClCompile Include="dnchost.cpp" /> |
| 54 | <ClCompile Include="dncutil.cpp" /> | 53 | <ClCompile Include="dncutil.cpp" /> |
| @@ -56,26 +55,27 @@ | |||
| 56 | <PrecompiledHeader>Create</PrecompiledHeader> | 55 | <PrecompiledHeader>Create</PrecompiledHeader> |
| 57 | </ClCompile> | 56 | </ClCompile> |
| 58 | </ItemGroup> | 57 | </ItemGroup> |
| 58 | |||
| 59 | <ItemGroup> | 59 | <ItemGroup> |
| 60 | <ClInclude Include="coreclrhost.h" /> | 60 | <ClInclude Include="coreclrhost.h" /> |
| 61 | <ClInclude Include="dnchost.h" /> | 61 | <ClInclude Include="dnchost.h" /> |
| 62 | <ClInclude Include="dncutil.h" /> | 62 | <ClInclude Include="dncutil.h" /> |
| 63 | <ClInclude Include="precomp.h" /> | 63 | <ClInclude Include="precomp.h" /> |
| 64 | </ItemGroup> | 64 | </ItemGroup> |
| 65 | |||
| 65 | <ItemGroup> | 66 | <ItemGroup> |
| 66 | <None Include="dnchost.def" /> | 67 | <None Include="dnchost.def" /> |
| 67 | </ItemGroup> | 68 | </ItemGroup> |
| 68 | <ItemGroup> | 69 | |
| 69 | <None Include="packages.config" /> | ||
| 70 | </ItemGroup> | ||
| 71 | <ItemDefinitionGroup> | 70 | <ItemDefinitionGroup> |
| 72 | <ClCompile> | 71 | <!-- <ClCompile> |
| 73 | <AdditionalIncludeDirectories>$(BaseOutputPath)obj;$(NetHostPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 72 | <AdditionalIncludeDirectories>$(BaseOutputPath)obj;$(NetHostPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 74 | </ClCompile> | 73 | </ClCompile> --> |
| 75 | <Link> | 74 | <Link> |
| 76 | <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> | 75 | <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> |
| 77 | </Link> | 76 | </Link> |
| 78 | </ItemDefinitionGroup> | 77 | </ItemDefinitionGroup> |
| 78 | |||
| 79 | <ItemGroup> | 79 | <ItemGroup> |
| 80 | <ProjectReference Include="..\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj"> | 80 | <ProjectReference Include="..\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj"> |
| 81 | <Project>{0D780900-C2FF-4FA2-8CB5-8A19768724C5}</Project> | 81 | <Project>{0D780900-C2FF-4FA2-8CB5-8A19768724C5}</Project> |
| @@ -83,24 +83,15 @@ | |||
| 83 | <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties> | 83 | <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties> |
| 84 | </ProjectReference> | 84 | </ProjectReference> |
| 85 | </ItemGroup> | 85 | </ItemGroup> |
| 86 | |||
| 87 | <ItemGroup> | ||
| 88 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 89 | <PackageReference Include="WixToolset.BalUtil" /> | ||
| 90 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 91 | |||
| 92 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 93 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 94 | </ItemGroup> | ||
| 95 | |||
| 86 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 96 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 87 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" /> | 97 | </Project> |
| 88 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" /> | ||
| 89 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" /> | ||
| 90 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
| 91 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 92 | <PropertyGroup> | ||
| 93 | <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> | ||
| 94 | </PropertyGroup> | ||
| 95 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" /> | ||
| 96 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" /> | ||
| 97 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" /> | ||
| 98 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" /> | ||
| 99 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> | ||
| 100 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | ||
| 101 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 102 | <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props'))" /> | ||
| 103 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 104 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 105 | </Target> | ||
| 106 | </Project> \ No newline at end of file | ||
diff --git a/src/ext/Bal/dnchost/packages.config b/src/ext/Bal/dnchost/packages.config index 6c369364..78fa970f 100644 --- a/src/ext/Bal/dnchost/packages.config +++ b/src/ext/Bal/dnchost/packages.config | |||
| @@ -1,13 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <packages> | 2 | <packages> |
| 3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 7 | <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> | 3 | <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> |
| 8 | <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> | 4 | <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> |
| 9 | <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> | 5 | <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> |
| 10 | <package id="WixToolset.BalUtil" version="4.0.58" targetFramework="native" /> | ||
| 11 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
| 12 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 13 | </packages> \ No newline at end of file | 6 | </packages> \ No newline at end of file |
diff --git a/src/ext/Bal/mbahost/mbahost.vcxproj b/src/ext/Bal/mbahost/mbahost.vcxproj index 6457b4e0..5edb2562 100644 --- a/src/ext/Bal/mbahost/mbahost.vcxproj +++ b/src/ext/Bal/mbahost/mbahost.vcxproj | |||
| @@ -1,14 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | 3 | ||
| 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> | ||
| 6 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | ||
| 7 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | ||
| 8 | <Import Project="..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" /> | ||
| 9 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
| 10 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 11 | |||
| 12 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 13 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 14 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -49,6 +42,7 @@ | |||
| 49 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 50 | 43 | ||
| 51 | <PropertyGroup> | 44 | <PropertyGroup> |
| 45 | <ProjectAdditionalIncludeDirectories>$(BaseOutputPath)obj</ProjectAdditionalIncludeDirectories> | ||
| 52 | <ProjectAdditionalLinkLibraries>shlwapi.lib</ProjectAdditionalLinkLibraries> | 46 | <ProjectAdditionalLinkLibraries>shlwapi.lib</ProjectAdditionalLinkLibraries> |
| 53 | </PropertyGroup> | 47 | </PropertyGroup> |
| 54 | 48 | ||
| @@ -66,16 +60,6 @@ | |||
| 66 | </ItemGroup> | 60 | </ItemGroup> |
| 67 | 61 | ||
| 68 | <ItemGroup> | 62 | <ItemGroup> |
| 69 | <None Include="packages.config" /> | ||
| 70 | </ItemGroup> | ||
| 71 | |||
| 72 | <ItemDefinitionGroup> | ||
| 73 | <ClCompile> | ||
| 74 | <AdditionalIncludeDirectories>$(BaseOutputPath)obj;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 75 | </ClCompile> | ||
| 76 | </ItemDefinitionGroup> | ||
| 77 | |||
| 78 | <ItemGroup> | ||
| 79 | <ProjectReference Include="..\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj"> | 63 | <ProjectReference Include="..\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj"> |
| 80 | <Project>{f2ba1935-70fa-4156-b161-fd03850b4faa}</Project> | 64 | <Project>{f2ba1935-70fa-4156-b161-fd03850b4faa}</Project> |
| 81 | <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | 65 | <ReferenceOutputAssembly>false</ReferenceOutputAssembly> |
| @@ -83,24 +67,14 @@ | |||
| 83 | </ProjectReference> | 67 | </ProjectReference> |
| 84 | </ItemGroup> | 68 | </ItemGroup> |
| 85 | 69 | ||
| 70 | <ItemGroup> | ||
| 71 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 72 | <PackageReference Include="WixToolset.BalUtil" /> | ||
| 73 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 74 | |||
| 75 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 76 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 77 | </ItemGroup> | ||
| 78 | |||
| 86 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 79 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 87 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" /> | 80 | </Project> |
| 88 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" /> | ||
| 89 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" /> | ||
| 90 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
| 91 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 92 | <PropertyGroup> | ||
| 93 | <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> | ||
| 94 | </PropertyGroup> | ||
| 95 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" /> | ||
| 96 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" /> | ||
| 97 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" /> | ||
| 98 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" /> | ||
| 99 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> | ||
| 100 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | ||
| 101 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 102 | <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props'))" /> | ||
| 103 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 104 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 105 | </Target> | ||
| 106 | </Project> \ No newline at end of file | ||
diff --git a/src/ext/Bal/mbahost/packages.config b/src/ext/Bal/mbahost/packages.config deleted file mode 100644 index 071284ac..00000000 --- a/src/ext/Bal/mbahost/packages.config +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 7 | <package id="WixToolset.BalUtil" version="4.0.58" targetFramework="native" /> | ||
| 8 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
| 9 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 10 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/Bal/nuget.config b/src/ext/Bal/nuget.config deleted file mode 100644 index f3277bc4..00000000 --- a/src/ext/Bal/nuget.config +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 11 | <add key="wixtoolset-balutil" value="https://ci.appveyor.com/nuget/wixtoolset-balutil" /> | ||
| 12 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 13 | <add key="wixtoolset-netfx-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-netfx-wixext" /> | ||
| 14 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 15 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 16 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 17 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 18 | </packageSources> | ||
| 19 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index c9ab4219..f00a8eff 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| @@ -24,20 +25,12 @@ | |||
| 24 | </ItemGroup> | 25 | </ItemGroup> |
| 25 | 26 | ||
| 26 | <ItemGroup> | 27 | <ItemGroup> |
| 27 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 28 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 28 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 29 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 30 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 31 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | ||
| 32 | </ItemGroup> | 29 | </ItemGroup> |
| 33 | 30 | ||
| 34 | <ItemGroup> | 31 | <ItemGroup> |
| 35 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 32 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 36 | </ItemGroup> | 33 | <PackageReference Include="xunit" /> |
| 37 | 34 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 38 | <ItemGroup> | ||
| 39 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 40 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 41 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 42 | </ItemGroup> | 35 | </ItemGroup> |
| 43 | </Project> | 36 | </Project> |
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs index 44538227..9d7fc9db 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs | |||
| @@ -10,7 +10,7 @@ namespace WixToolsetTest.ManagedHost | |||
| 10 | 10 | ||
| 11 | public class TestEngine | 11 | public class TestEngine |
| 12 | { | 12 | { |
| 13 | private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); | 13 | private static readonly string TestEngineFile = TestData.Get(@"..\x86\examples\Example.TestEngine\Example.TestEngine.exe"); |
| 14 | 14 | ||
| 15 | public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) | 15 | public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) |
| 16 | { | 16 | { |
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 38c8926c..16dbec94 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | |||
| @@ -4,22 +4,21 @@ | |||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | ||
| 8 | <SignOutput>false</SignOutput> | ||
| 7 | </PropertyGroup> | 9 | </PropertyGroup> |
| 8 | 10 | ||
| 9 | <ItemGroup> | 11 | <ItemGroup> |
| 10 | <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" /> | 12 | <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" ReferenceOutputAssembly="false" /> |
| 11 | </ItemGroup> | 13 | </ItemGroup> |
| 12 | 14 | ||
| 13 | <ItemGroup> | 15 | <ItemGroup> |
| 14 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 16 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 15 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 16 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 17 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 18 | </ItemGroup> | 17 | </ItemGroup> |
| 19 | 18 | ||
| 20 | <ItemGroup> | 19 | <ItemGroup> |
| 21 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | 20 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 22 | <PackageReference Include="xunit" Version="2.4.1" /> | 21 | <PackageReference Include="xunit" /> |
| 23 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 22 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
| 24 | </ItemGroup> | 23 | </ItemGroup> |
| 25 | </Project> | 24 | </Project> |
diff --git a/src/ext/Bal/test/examples/Directory.Build.props b/src/ext/Bal/test/examples/Directory.Build.props index 3d5870a5..52b931f6 100644 --- a/src/ext/Bal/test/examples/Directory.Build.props +++ b/src/ext/Bal/test/examples/Directory.Build.props | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | <Project> | 3 | <Project> |
| 4 | <Import Project="..\..\Directory.Build.props" /> | 4 | <Import Project="$(MsbuildThisFileDirectory)..\..\Directory.Build.props" /> |
| 5 | <Import Project="Wix.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " /> | 5 | <Import Project="Wix.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " /> |
| 6 | </Project> | 6 | </Project> |
diff --git a/src/ext/Bal/test/examples/Directory.Build.targets b/src/ext/Bal/test/examples/Directory.Build.targets index 6dcf402b..35946585 100644 --- a/src/ext/Bal/test/examples/Directory.Build.targets +++ b/src/ext/Bal/test/examples/Directory.Build.targets | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | <Project> | 3 | <Project> |
| 4 | <Import Project="..\..\Directory.Build.targets" /> | 4 | <Import Project="$(MsbuildThisFileDirectory)..\..\..\..\Directory.Build.targets" /> |
| 5 | <Import Project="Wix.Build.targets" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " /> | 5 | <Import Project="Wix.Build.targets" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " /> |
| 6 | </Project> | 6 | </Project> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs index d146845c..d7b06f6a 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | <BootstrapperApplication> | 3 | <BootstrapperApplication> |
| 4 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.deps.json" Name="Example.EarliestCoreMBA.deps.json" /> | 4 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.deps.json" Name="Example.EarliestCoreMBA.deps.json" /> |
| 5 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> | 5 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> |
| 6 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.pdb" Name="Example.EarliestCoreMBA.pdb" /> | ||
| 7 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" /> |
| 8 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> |
| 9 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index cb66c138..8069df45 100644 --- a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 15 | <PackageReference Include="WixToolset.Mba.Core" /> |
| 16 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" /> | ||
| 17 | </ItemGroup> | 16 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 17 | </Project> |
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 21079ed1..7e0e4881 100644 --- a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | |||
| @@ -15,6 +15,11 @@ | |||
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | 16 | ||
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" /> | 18 | <PackageReference Include="WixToolset.Mba.Core" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | |
| 21 | <ItemGroup> | ||
| 22 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 23 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 24 | </ItemGroup> | ||
| 25 | </Project> | ||
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index a05e7888..ae0d4cc8 100644 --- a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | |||
| @@ -9,11 +9,10 @@ | |||
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 12 | <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" /> |
| 13 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" PrivateAssets="All" /> | ||
| 14 | </ItemGroup> | 13 | </ItemGroup> |
| 15 | 14 | ||
| 16 | <ItemGroup> | 15 | <ItemGroup> |
| 17 | <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" /> | 16 | <PackageReference Include="WixToolset.Mba.Core" /> |
| 18 | </ItemGroup> | 17 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 18 | </Project> |
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs index d5b543e8..c569442a 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | <BootstrapperApplication> | 3 | <BootstrapperApplication> |
| 4 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.deps.json" Name="Example.LatestCoreMBA.deps.json" /> | 4 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.deps.json" Name="Example.LatestCoreMBA.deps.json" /> |
| 5 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> | 5 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> |
| 6 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.pdb" Name="Example.LatestCoreMBA.pdb" /> | ||
| 7 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" /> |
| 8 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> |
| 9 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> |
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index 9f3f02d9..aad56a3e 100644 --- a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | 16 | ||
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 18 | <PackageReference Include="WixToolset.Mba.Core" /> |
| 19 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" /> | ||
| 20 | </ItemGroup> | 19 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 20 | </Project> |
diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj index 99eb917e..39207d77 100644 --- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj | |||
| @@ -1,9 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | |
| 4 | <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" /> | 4 | <Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
| 6 | <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 7 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 8 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 9 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -30,6 +28,7 @@ | |||
| 30 | <Platform>x64</Platform> | 28 | <Platform>x64</Platform> |
| 31 | </ProjectConfiguration> | 29 | </ProjectConfiguration> |
| 32 | </ItemGroup> | 30 | </ItemGroup> |
| 31 | |||
| 33 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
| 34 | <ProjectGuid>{3D44B67D-A475-49BA-8310-E39F6C117CC9}</ProjectGuid> | 33 | <ProjectGuid>{3D44B67D-A475-49BA-8310-E39F6C117CC9}</ProjectGuid> |
| 35 | <ConfigurationType>Application</ConfigurationType> | 34 | <ConfigurationType>Application</ConfigurationType> |
| @@ -39,17 +38,10 @@ | |||
| 39 | <CharacterSet>Unicode</CharacterSet> | 38 | <CharacterSet>Unicode</CharacterSet> |
| 40 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | 39 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> |
| 41 | </PropertyGroup> | 40 | </PropertyGroup> |
| 41 | |||
| 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 44 | <ImportGroup Label="ExtensionSettings"> | 44 | |
| 45 | </ImportGroup> | ||
| 46 | <ImportGroup Label="Shared"> | ||
| 47 | <Import Project="..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
| 48 | </ImportGroup> | ||
| 49 | <PropertyGroup> | ||
| 50 | <ProjectAdditionalLinkLibraries> | ||
| 51 | </ProjectAdditionalLinkLibraries> | ||
| 52 | </PropertyGroup> | ||
| 53 | <ItemGroup> | 45 | <ItemGroup> |
| 54 | <ClCompile Include="precomp.cpp"> | 46 | <ClCompile Include="precomp.cpp"> |
| 55 | <PrecompiledHeader>Create</PrecompiledHeader> | 47 | <PrecompiledHeader>Create</PrecompiledHeader> |
| @@ -60,6 +52,7 @@ | |||
| 60 | <ClCompile Include="TestEngine.cpp" /> | 52 | <ClCompile Include="TestEngine.cpp" /> |
| 61 | <ClCompile Include="WaitForQuitEngine.cpp" /> | 53 | <ClCompile Include="WaitForQuitEngine.cpp" /> |
| 62 | </ItemGroup> | 54 | </ItemGroup> |
| 55 | |||
| 63 | <ItemGroup> | 56 | <ItemGroup> |
| 64 | <ClInclude Include="precomp.h" /> | 57 | <ClInclude Include="precomp.h" /> |
| 65 | <ClInclude Include="ReloadEngine.h" /> | 58 | <ClInclude Include="ReloadEngine.h" /> |
| @@ -67,17 +60,15 @@ | |||
| 67 | <ClInclude Include="TestEngine.h" /> | 60 | <ClInclude Include="TestEngine.h" /> |
| 68 | <ClInclude Include="WaitForQuitEngine.h" /> | 61 | <ClInclude Include="WaitForQuitEngine.h" /> |
| 69 | </ItemGroup> | 62 | </ItemGroup> |
| 63 | |||
| 70 | <ItemGroup> | 64 | <ItemGroup> |
| 71 | <None Include="packages.config" /> | 65 | <PackageReference Include="WixToolset.Dutil" /> |
| 66 | <PackageReference Include="WixToolset.BalUtil" /> | ||
| 67 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 68 | |||
| 69 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 70 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 72 | </ItemGroup> | 71 | </ItemGroup> |
| 72 | |||
| 73 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 73 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 74 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 74 | </Project> |
| 75 | <PropertyGroup> | ||
| 76 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | ||
| 77 | </PropertyGroup> | ||
| 78 | <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 79 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props'))" /> | ||
| 80 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 81 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 82 | </Target> | ||
| 83 | </Project> \ No newline at end of file | ||
diff --git a/src/ext/Bal/test/examples/TestEngine/packages.config b/src/ext/Bal/test/examples/TestEngine/packages.config deleted file mode 100644 index 548ddb48..00000000 --- a/src/ext/Bal/test/examples/TestEngine/packages.config +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
| 5 | <package id="WixToolset.BalUtil" version="4.0.58" targetFramework="native" /> | ||
| 6 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 7 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs index 68d742b0..aa2bdeb2 100644 --- a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | <BootstrapperApplication> | 3 | <BootstrapperApplication> |
| 4 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.deps.json" Name="Example.WPFCoreMBA.deps.json" /> | 4 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.deps.json" Name="Example.WPFCoreMBA.deps.json" /> |
| 5 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll" Name="Example.WPFCoreMBA.dll" bal:BAFactoryAssembly="yes" /> | 5 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll" Name="Example.WPFCoreMBA.dll" bal:BAFactoryAssembly="yes" /> |
| 6 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.pdb" Name="Example.WPFCoreMBA.pdb" /> | ||
| 7 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json" Name="Example.WPFCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json" Name="Example.WPFCoreMBA.runtimeconfig.json" /> |
| 8 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> |
| 9 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> |
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj index 296e5be9..3d63e7b9 100644 --- a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | |||
| @@ -8,9 +8,17 @@ | |||
| 8 | <UseWPF>true</UseWPF> | 8 | <UseWPF>true</UseWPF> |
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | |||
| 12 | <ItemGroup> | 11 | <ItemGroup> |
| 13 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 12 | <PackageReference Include="WixToolset.Mba.Core" /> |
| 14 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" /> | ||
| 15 | </ItemGroup> | 13 | </ItemGroup> |
| 16 | </Project> \ No newline at end of file | 14 | |
| 15 | <Target Name="GitVersion"> | ||
| 16 | <PropertyGroup> | ||
| 17 | <GitBaseVersionMajor>42</GitBaseVersionMajor> | ||
| 18 | <GitBaseVersionMinor>42</GitBaseVersionMinor> | ||
| 19 | <GitBaseVersionPatch>42</GitBaseVersionPatch> | ||
| 20 | <GitCommits>42</GitCommits> | ||
| 21 | <GitSha>abc123def456</GitSha> | ||
| 22 | </PropertyGroup> | ||
| 23 | </Target> | ||
| 24 | </Project> | ||
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj index 08cb7511..5722cfcb 100644 --- a/src/ext/Bal/test/examples/examples.proj +++ b/src/ext/Bal/test/examples/examples.proj | |||
| @@ -46,5 +46,5 @@ | |||
| 46 | <MSBuild Projects="%(ExampleBundleProject.Identity)" /> | 46 | <MSBuild Projects="%(ExampleBundleProject.Identity)" /> |
| 47 | </Target> | 47 | </Target> |
| 48 | 48 | ||
| 49 | <Import Project="..\..\Directory.Build.targets" /> | 49 | <Import Project="..\..\..\..\Directory.Build.targets" /> |
| 50 | </Project> \ No newline at end of file | 50 | </Project> \ No newline at end of file |
diff --git a/src/ext/Bal/wix.snk b/src/ext/Bal/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/Bal/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj index 00451403..f74baa9a 100644 --- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj +++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj | |||
| @@ -8,32 +8,20 @@ | |||
| 8 | <Description>WiX Toolset Bal Extension</Description> | 8 | <Description>WiX Toolset Bal Extension</Description> |
| 9 | <Title>WiX Toolset Bal Extension</Title> | 9 | <Title>WiX Toolset Bal Extension</Title> |
| 10 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
| 11 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> | ||
| 12 | <IncludeSymbols>true</IncludeSymbols> | 11 | <IncludeSymbols>true</IncludeSymbols> |
| 13 | <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 14 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | |||
| 15 | <ItemGroup> | 14 | <ItemGroup> |
| 16 | <Content Include="$(MSBuildThisFileName).targets" /> | 15 | <Content Include="$(MSBuildThisFileName).targets" /> |
| 17 | <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" /> | 16 | <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" /> |
| 18 | </ItemGroup> | 17 | </ItemGroup> |
| 19 | <ItemGroup> | ||
| 20 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> | ||
| 21 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | ||
| 22 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | ||
| 23 | </ItemGroup> | ||
| 24 | 18 | ||
| 25 | <ItemGroup> | 19 | <ItemGroup> |
| 26 | <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 20 | <PackageReference Include="WixToolset.Data" PrivateAssets="all" /> |
| 21 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> | ||
| 27 | </ItemGroup> | 22 | </ItemGroup> |
| 28 | 23 | ||
| 29 | <ItemGroup> | 24 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
| 30 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 25 | <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" /> |
| 31 | </ItemGroup> | 26 | </ItemGroup> |
| 32 | |||
| 33 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"> | ||
| 34 | <PropertyGroup> | ||
| 35 | <NuspecBasePath>$(OutputPath)..\</NuspecBasePath> | ||
| 36 | <NuspecProperties>$(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties> | ||
| 37 | </PropertyGroup> | ||
| 38 | </Target> | ||
| 39 | </Project> | 27 | </Project> |
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec index d9e704ae..c99c803f 100644 --- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec +++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec | |||
| @@ -15,12 +15,12 @@ | |||
| 15 | </metadata> | 15 | </metadata> |
| 16 | 16 | ||
| 17 | <files> | 17 | <files> |
| 18 | <file src="$projectFolder$$id$.targets" target="build" /> | 18 | <file src="$projectFolder$\$id$.targets" target="build" /> |
| 19 | 19 | ||
| 20 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 20 | <file src="$id$.dll" target="tools" /> |
| 21 | 21 | ||
| 22 | <file src="x86\*.pdb" target="pdbs\x86" /> | 22 | <file src="..\x86\*.pdb" target="pdbs\x86" /> |
| 23 | <file src="x64\*.pdb" target="pdbs\x64" /> | 23 | <file src="..\x64\*.pdb" target="pdbs\x64" /> |
| 24 | <file src="ARM64\*.pdb" target="pdbs\ARM64" /> | 24 | <file src="..\ARM64\*.pdb" target="pdbs\ARM64" /> |
| 25 | </files> | 25 | </files> |
| 26 | </package> | 26 | </package> |
diff --git a/src/ext/Bal/wixlib/BalExtension_arm64.wxs b/src/ext/Bal/wixlib/BalExtension_arm64.wxs index 1b9e11d2..9a1ca60c 100644 --- a/src/ext/Bal/wixlib/BalExtension_arm64.wxs +++ b/src/ext/Bal/wixlib/BalExtension_arm64.wxs | |||
| @@ -1,7 +1,7 @@ | |||
| 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 | |||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | <?define platform=arm64 ?> | 4 | <?define platform=arm64 ?> |
| 6 | <?include BalExtension_platform.wxi ?> | 5 | <?include BalExtension_platform.wxi ?> |
| 6 | <?include Mbahost_platform.wxi ?> | ||
| 7 | </Wix> | 7 | </Wix> |
diff --git a/src/ext/Bal/wixlib/BalExtension_platform.wxi b/src/ext/Bal/wixlib/BalExtension_platform.wxi index 33122fb2..6978ba99 100644 --- a/src/ext/Bal/wixlib/BalExtension_platform.wxi +++ b/src/ext/Bal/wixlib/BalExtension_platform.wxi | |||
| @@ -16,20 +16,6 @@ | |||
| 16 | </BootstrapperApplication> | 16 | </BootstrapperApplication> |
| 17 | <BootstrapperApplicationRef Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)" /> | 17 | <BootstrapperApplicationRef Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)" /> |
| 18 | </Fragment> | 18 | </Fragment> |
| 19 | |||
| 20 | <Fragment> | ||
| 21 | <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)"> | ||
| 22 | <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" /> | ||
| 23 | <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" /> | ||
| 24 | <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" /> | ||
| 25 | </BootstrapperApplication> | ||
| 26 | </Fragment> | ||
| 27 | <Fragment> | ||
| 28 | <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost.Standard$(var.Suffix)"> | ||
| 29 | <PayloadGroupRef Id="MbaPreqStandardPayloads" /> | ||
| 30 | </BootstrapperApplication> | ||
| 31 | <BootstrapperApplicationRef Id="WixManagedBootstrapperApplicationHost$(var.Suffix)" /> | ||
| 32 | </Fragment> | ||
| 33 | 19 | ||
| 34 | <Fragment> | 20 | <Fragment> |
| 35 | <BootstrapperApplication Id="WixStandardBootstrapperApplication$(var.Suffix)"> | 21 | <BootstrapperApplication Id="WixStandardBootstrapperApplication$(var.Suffix)"> |
diff --git a/src/ext/Bal/wixlib/BalExtension_x64.wxs b/src/ext/Bal/wixlib/BalExtension_x64.wxs index 69a597ae..e5252718 100644 --- a/src/ext/Bal/wixlib/BalExtension_x64.wxs +++ b/src/ext/Bal/wixlib/BalExtension_x64.wxs | |||
| @@ -4,4 +4,5 @@ | |||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | <?define platform=x64 ?> | 5 | <?define platform=x64 ?> |
| 6 | <?include BalExtension_platform.wxi ?> | 6 | <?include BalExtension_platform.wxi ?> |
| 7 | <?include Mbahost_platform.wxi ?> | ||
| 7 | </Wix> | 8 | </Wix> |
diff --git a/src/ext/Bal/wixlib/BalExtension_x86.wxs b/src/ext/Bal/wixlib/BalExtension_x86.wxs index 3cdd4015..1045160d 100644 --- a/src/ext/Bal/wixlib/BalExtension_x86.wxs +++ b/src/ext/Bal/wixlib/BalExtension_x86.wxs | |||
| @@ -4,4 +4,5 @@ | |||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | <?define platform=x86 ?> | 5 | <?define platform=x86 ?> |
| 6 | <?include BalExtension_platform.wxi ?> | 6 | <?include BalExtension_platform.wxi ?> |
| 7 | <?include Mbahost_platform.wxi ?> | ||
| 7 | </Wix> | 8 | </Wix> |
diff --git a/src/ext/Bal/wixlib/Mbahost_platform.wxi b/src/ext/Bal/wixlib/Mbahost_platform.wxi new file mode 100644 index 00000000..06d7f1fc --- /dev/null +++ b/src/ext/Bal/wixlib/Mbahost_platform.wxi | |||
| @@ -0,0 +1,19 @@ | |||
| 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 | |||
| 4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 5 | <?include caDecor.wxi ?> | ||
| 6 | <Fragment> | ||
| 7 | <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)"> | ||
| 8 | <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" /> | ||
| 9 | <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" /> | ||
| 10 | <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" /> | ||
| 11 | </BootstrapperApplication> | ||
| 12 | </Fragment> | ||
| 13 | <Fragment> | ||
| 14 | <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost.Standard$(var.Suffix)"> | ||
| 15 | <PayloadGroupRef Id="MbaPreqStandardPayloads" /> | ||
| 16 | </BootstrapperApplication> | ||
| 17 | <BootstrapperApplicationRef Id="WixManagedBootstrapperApplicationHost$(var.Suffix)" /> | ||
| 18 | </Fragment> | ||
| 19 | </Include> | ||
diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj index fdcc7475..147b1a74 100644 --- a/src/ext/Bal/wixlib/bal.wixproj +++ b/src/ext/Bal/wixlib/bal.wixproj | |||
| @@ -1,10 +1,11 @@ | |||
| 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 | <Project Sdk="WixToolset.Sdk" ToolsVersion="4.0"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <OutputType>Library</OutputType> | 4 | <OutputType>Library</OutputType> |
| 5 | <BindFiles>true</BindFiles> | 5 | <BindFiles>true</BindFiles> |
| 6 | <Cultures>en-us</Cultures> | 6 | <Cultures>en-us</Cultures> |
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | |||
| 8 | <ItemGroup> | 9 | <ItemGroup> |
| 9 | <BindInputPaths Include="..\wixstdba\Resources\" /> | 10 | <BindInputPaths Include="..\wixstdba\Resources\" /> |
| 10 | <BindInputPaths Include="$(OutputPath)netcoreapp3.1" /> | 11 | <BindInputPaths Include="$(OutputPath)netcoreapp3.1" /> |
| @@ -13,24 +14,28 @@ | |||
| 13 | <BindInputPaths Include="$(OutputPath)x64" BindName="x64" /> | 14 | <BindInputPaths Include="$(OutputPath)x64" BindName="x64" /> |
| 14 | <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" /> | 15 | <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" /> |
| 15 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | |||
| 16 | <ItemGroup> | 18 | <ItemGroup> |
| 17 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=ARM64" /> | 19 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> |
| 18 | <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=ARM64" /> | 20 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> |
| 19 | <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=ARM64" /> | 21 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> |
| 20 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x86" /> | 22 | <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> |
| 21 | <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x86" /> | 23 | <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> |
| 22 | <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x86" /> | 24 | <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> |
| 23 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x64" /> | 25 | <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> |
| 24 | <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x64" /> | 26 | <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> |
| 25 | <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x64" /> | 27 | <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> |
| 26 | </ItemGroup> | 28 | </ItemGroup> |
| 29 | |||
| 27 | <ItemGroup> | 30 | <ItemGroup> |
| 28 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 31 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 32 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 29 | </ItemGroup> | 33 | </ItemGroup> |
| 34 | |||
| 30 | <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway --> | 35 | <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway --> |
| 31 | <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants"> | 36 | <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants"> |
| 32 | <PropertyGroup> | 37 | <PropertyGroup> |
| 33 | <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants> | 38 | <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants> |
| 34 | </PropertyGroup> | 39 | </PropertyGroup> |
| 35 | </Target> | 40 | </Target> |
| 36 | </Project> \ No newline at end of file | 41 | </Project> |
diff --git a/src/ext/Bal/wixstdba/packages.config b/src/ext/Bal/wixstdba/packages.config deleted file mode 100644 index 071284ac..00000000 --- a/src/ext/Bal/wixstdba/packages.config +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 7 | <package id="WixToolset.BalUtil" version="4.0.58" targetFramework="native" /> | ||
| 8 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
| 9 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 10 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj index 06b1c8d8..fba3e885 100644 --- a/src/ext/Bal/wixstdba/wixstdba.vcxproj +++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj | |||
| @@ -1,14 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | 3 | ||
| 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> | ||
| 6 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | ||
| 7 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | ||
| 8 | <Import Project="..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" /> | ||
| 9 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
| 10 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 11 | |||
| 12 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 13 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 14 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -78,24 +71,14 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command> | |||
| 78 | </CustomBuild> | 71 | </CustomBuild> |
| 79 | </ItemGroup> | 72 | </ItemGroup> |
| 80 | 73 | ||
| 74 | <ItemGroup> | ||
| 75 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 76 | <PackageReference Include="WixToolset.BalUtil" /> | ||
| 77 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 78 | |||
| 79 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 80 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 81 | </ItemGroup> | ||
| 82 | |||
| 81 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 83 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 82 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" /> | 84 | </Project> |
| 83 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" /> | ||
| 84 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" /> | ||
| 85 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
| 86 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 87 | <PropertyGroup> | ||
| 88 | <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> | ||
| 89 | </PropertyGroup> | ||
| 90 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" /> | ||
| 91 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" /> | ||
| 92 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" /> | ||
| 93 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" /> | ||
| 94 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> | ||
| 95 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | ||
| 96 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 97 | <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.58\build\WixToolset.BalUtil.props'))" /> | ||
| 98 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
| 99 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 100 | </Target> | ||
| 101 | </Project> \ No newline at end of file | ||
diff --git a/src/ext/ComPlus/CSharp.Build.props b/src/ext/ComPlus/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/ComPlus/CSharp.Build.props +++ /dev/null | |||
| @@ -1,11 +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 | <SignAssembly>true</SignAssembly> | ||
| 9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | </Project> | ||
diff --git a/src/ext/ComPlus/ComPlus.wixext.sln b/src/ext/ComPlus/ComPlus.wixext.sln index 9fab25f2..06302fa2 100644 --- a/src/ext/ComPlus/ComPlus.wixext.sln +++ b/src/ext/ComPlus/ComPlus.wixext.sln | |||
| @@ -3,16 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30611.23 | 4 | VisualStudioVersion = 16.0.30611.23 |
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complusca", "src\ca\complusca.vcxproj", "{BDEF51ED-E242-4FA2-801A-01B127DF851A}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complusca", "ca\complusca.vcxproj", "{BDEF51ED-E242-4FA2-801A-01B127DF851A}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "complus", "src\wixlib\complus.wixproj", "{E191E61E-E098-4F71-888F-51A79F952022}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "complus", "wixlib\complus.wixproj", "{E191E61E-E098-4F71-888F-51A79F952022}" |
| 9 | ProjectSection(ProjectDependencies) = postProject | 9 | ProjectSection(ProjectDependencies) = postProject |
| 10 | {BDEF51ED-E242-4FA2-801A-01B127DF851A} = {BDEF51ED-E242-4FA2-801A-01B127DF851A} | 10 | {BDEF51ED-E242-4FA2-801A-01B127DF851A} = {BDEF51ED-E242-4FA2-801A-01B127DF851A} |
| 11 | EndProjectSection | 11 | EndProjectSection |
| 12 | EndProject | 12 | EndProject |
| 13 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.ComPlus.wixext", "src\wixext\WixToolset.ComPlus.wixext.csproj", "{1497B777-330B-4CFE-927A-22850CD24D64}" | 13 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.ComPlus.wixext", "wixext\WixToolset.ComPlus.wixext.csproj", "{1497B777-330B-4CFE-927A-22850CD24D64}" |
| 14 | EndProject | 14 | EndProject |
| 15 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ComPlus", "src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj", "{2FC5F039-EACF-428B-BA87-8CDE1D25E121}" | 15 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ComPlus", "test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj", "{2FC5F039-EACF-428B-BA87-8CDE1D25E121}" |
| 16 | EndProject | 16 | EndProject |
| 17 | Global | 17 | Global |
| 18 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 18 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/ComPlus/Cpp.Build.props b/src/ext/ComPlus/Cpp.Build.props deleted file mode 100644 index 9551e76f..00000000 --- a/src/ext/ComPlus/Cpp.Build.props +++ /dev/null | |||
| @@ -1,88 +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' OR '$(Platform)' == 'x86' ">Win32</Platform> | ||
| 7 | <NormalizedPlatform Condition=" '$(Platform)'=='Win32' ">x86</NormalizedPlatform> | ||
| 8 | <NormalizedPlatform Condition=" '$(NormalizedPlatform)'=='' ">$(Platform)</NormalizedPlatform> | ||
| 9 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(NormalizedPlatform)\</IntDir> | ||
| 10 | <OutDir>$(OutputPath)$(NormalizedPlatform)\</OutDir> | ||
| 11 | </PropertyGroup> | ||
| 12 | |||
| 13 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 14 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 15 | </PropertyGroup> | ||
| 16 | |||
| 17 | <ItemDefinitionGroup> | ||
| 18 | <ClCompile> | ||
| 19 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 20 | <WarningLevel>Level4</WarningLevel> | ||
| 21 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 22 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 23 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 24 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 25 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 26 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 27 | <ExceptionHandling>false</ExceptionHandling> | ||
| 28 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 29 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 30 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 31 | </ClCompile> | ||
| 32 | <ResourceCompile> | ||
| 33 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 34 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 35 | </ResourceCompile> | ||
| 36 | <Lib> | ||
| 37 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 38 | </Lib> | ||
| 39 | <Link> | ||
| 40 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 41 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 42 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 43 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 44 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 45 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 46 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 47 | </Link> | ||
| 48 | </ItemDefinitionGroup> | ||
| 49 | |||
| 50 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 51 | <ClCompile> | ||
| 52 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 53 | </ClCompile> | ||
| 54 | </ItemDefinitionGroup> | ||
| 55 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 56 | <ClCompile> | ||
| 57 | <CallingConvention>CDecl</CallingConvention> | ||
| 58 | </ClCompile> | ||
| 59 | </ItemDefinitionGroup> | ||
| 60 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 61 | <ClCompile> | ||
| 62 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 63 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 64 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 65 | </ClCompile> | ||
| 66 | </ItemDefinitionGroup> | ||
| 67 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 68 | <ClCompile> | ||
| 69 | <Optimization>Disabled</Optimization> | ||
| 70 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 71 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 72 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 73 | </ClCompile> | ||
| 74 | </ItemDefinitionGroup> | ||
| 75 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 76 | <ClCompile> | ||
| 77 | <Optimization>MinSpace</Optimization> | ||
| 78 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 79 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 80 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 81 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 82 | </ClCompile> | ||
| 83 | <Link> | ||
| 84 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 85 | <OptimizeReferences>true</OptimizeReferences> | ||
| 86 | </Link> | ||
| 87 | </ItemDefinitionGroup> | ||
| 88 | </Project> | ||
diff --git a/src/ext/ComPlus/Directory.Build.props b/src/ext/ComPlus/Directory.Build.props index b3c6287c..9ce65568 100644 --- a/src/ext/ComPlus/Directory.Build.props +++ b/src/ext/ComPlus/Directory.Build.props | |||
| @@ -1,27 +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>ComPlus.wixext</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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | 9 | <Import Project="..\..\Directory.Build.props" /> |
| 26 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 27 | </Project> | 10 | </Project> |
diff --git a/src/ext/ComPlus/Directory.Build.targets b/src/ext/ComPlus/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/ComPlus/Directory.Build.targets +++ /dev/null | |||
| @@ -1,51 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | |||
| 49 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 50 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 51 | </Project> | ||
diff --git a/src/ext/ComPlus/Directory.csproj.props b/src/ext/ComPlus/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/ComPlus/Directory.csproj.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/ext/ComPlus/Directory.csproj.targets b/src/ext/ComPlus/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/ComPlus/Directory.csproj.targets +++ /dev/null | |||
| @@ -1,26 +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\Directory.csproj.targets | ||
| 4 | then update all of the repos. | ||
| 5 | --> | ||
| 6 | <Project> | ||
| 7 | <PropertyGroup> | ||
| 8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 13 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 14 | <PropertyGroup> | ||
| 15 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 16 | |||
| 17 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 18 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath> | ||
| 19 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 20 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 21 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 22 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 23 | </PropertyGroup> | ||
| 24 | </Target> | ||
| 25 | |||
| 26 | </Project> | ||
diff --git a/src/ext/ComPlus/Directory.vcxproj.props b/src/ext/ComPlus/Directory.vcxproj.props deleted file mode 100644 index 664bc1d8..00000000 --- a/src/ext/ComPlus/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,93 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <ItemDefinitionGroup> | ||
| 23 | <ClCompile> | ||
| 24 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 25 | <WarningLevel>Level4</WarningLevel> | ||
| 26 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 27 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 28 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 29 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 30 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 31 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 32 | <ExceptionHandling>false</ExceptionHandling> | ||
| 33 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 34 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 35 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 36 | </ClCompile> | ||
| 37 | <ResourceCompile> | ||
| 38 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 39 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 40 | </ResourceCompile> | ||
| 41 | <Lib> | ||
| 42 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 43 | </Lib> | ||
| 44 | <Link> | ||
| 45 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 46 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 47 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 48 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 49 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 50 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 51 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 52 | </Link> | ||
| 53 | </ItemDefinitionGroup> | ||
| 54 | |||
| 55 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 56 | <ClCompile> | ||
| 57 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 58 | </ClCompile> | ||
| 59 | </ItemDefinitionGroup> | ||
| 60 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 61 | <ClCompile> | ||
| 62 | <CallingConvention>CDecl</CallingConvention> | ||
| 63 | </ClCompile> | ||
| 64 | </ItemDefinitionGroup> | ||
| 65 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 66 | <ClCompile> | ||
| 67 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 68 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 69 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 70 | </ClCompile> | ||
| 71 | </ItemDefinitionGroup> | ||
| 72 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 73 | <ClCompile> | ||
| 74 | <Optimization>Disabled</Optimization> | ||
| 75 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 76 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 78 | </ClCompile> | ||
| 79 | </ItemDefinitionGroup> | ||
| 80 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 81 | <ClCompile> | ||
| 82 | <Optimization>MinSpace</Optimization> | ||
| 83 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 84 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 85 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 86 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 87 | </ClCompile> | ||
| 88 | <Link> | ||
| 89 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 90 | <OptimizeReferences>true</OptimizeReferences> | ||
| 91 | </Link> | ||
| 92 | </ItemDefinitionGroup> | ||
| 93 | </Project> | ||
diff --git a/src/ext/ComPlus/Wix.Build.props b/src/ext/ComPlus/Wix.Build.props deleted file mode 100644 index a81c9615..00000000 --- a/src/ext/ComPlus/Wix.Build.props +++ /dev/null | |||
| @@ -1,31 +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 | <DefineConstants>$(DefineConstants);CompanyName=$(Company)</DefineConstants> | ||
| 7 | <OutputPath_x86>$(OutputPath)x86\</OutputPath_x86> | ||
| 8 | <OutputPath_x64>$(OutputPath)x64\</OutputPath_x64> | ||
| 9 | <OutputPath_arm>$(OutputPath)ARM\</OutputPath_arm> | ||
| 10 | <OutputPath_arm64>$(OutputPath)ARM64\</OutputPath_arm64> | ||
| 11 | <OutputPath_win32>$(OutputPath)Win32\</OutputPath_win32> | ||
| 12 | </PropertyGroup> | ||
| 13 | |||
| 14 | <ItemGroup> | ||
| 15 | <BindInputPaths Include="$(OutputPath_x86)"> | ||
| 16 | <BindName>x86</BindName> | ||
| 17 | </BindInputPaths> | ||
| 18 | <BindInputPaths Include="$(OutputPath_x64)"> | ||
| 19 | <BindName>x64</BindName> | ||
| 20 | </BindInputPaths> | ||
| 21 | <BindInputPaths Include="$(OutputPath_arm)"> | ||
| 22 | <BindName>arm</BindName> | ||
| 23 | </BindInputPaths> | ||
| 24 | <BindInputPaths Include="$(OutputPath_arm64)"> | ||
| 25 | <BindName>arm64</BindName> | ||
| 26 | </BindInputPaths> | ||
| 27 | <BindInputPaths Include="$(OutputPath_win32)"> | ||
| 28 | <BindName>win32</BindName> | ||
| 29 | </BindInputPaths> | ||
| 30 | </ItemGroup> | ||
| 31 | </Project> | ||
diff --git a/src/ext/ComPlus/appveyor.cmd b/src/ext/ComPlus/appveyor.cmd deleted file mode 100644 index 17900d31..00000000 --- a/src/ext/ComPlus/appveyor.cmd +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | :: Restore | ||
| 7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
| 8 | |||
| 9 | ::msbuild -p:Configuration=%_C% -p:Platform=Win32 src\ca\complusca.vcxproj || exit /b | ||
| 10 | ::msbuild -p:Configuration=%_C% -p:Platform=x64 src\ca\complusca.vcxproj || exit /b | ||
| 11 | |||
| 12 | :: Build | ||
| 13 | msbuild -p:Configuration=%_C% src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b | ||
| 14 | |||
| 15 | :: Test | ||
| 16 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.ComPlus || exit /b | ||
| 17 | |||
| 18 | :: Pack | ||
| 19 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.ComPlus.wixext.csproj || exit /b | ||
| 20 | |||
| 21 | @popd | ||
| 22 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/ComPlus/appveyor.yml b/src/ext/ComPlus/appveyor.yml deleted file mode 100644 index c53cc9cc..00000000 --- a/src/ext/ComPlus/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\**\*.snupkg | ||
| 37 | name: snupkg | ||
| 38 | |||
| 39 | notifications: | ||
| 40 | - provider: Slack | ||
| 41 | incoming_webhook: | ||
| 42 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/ComPlus/ca/complusca.vcxproj b/src/ext/ComPlus/ca/complusca.vcxproj index 3a7f6e64..5a8b23cd 100644 --- a/src/ext/ComPlus/ca/complusca.vcxproj +++ b/src/ext/ComPlus/ca/complusca.vcxproj | |||
| @@ -85,11 +85,11 @@ | |||
| 85 | </ItemGroup> | 85 | </ItemGroup> |
| 86 | 86 | ||
| 87 | <ItemGroup> | 87 | <ItemGroup> |
| 88 | <PackageReference Include="WixToolset.Dutil" Version="4.0.62" /> | 88 | <PackageReference Include="WixToolset.Dutil" /> |
| 89 | <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" /> | 89 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 90 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 90 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 91 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 91 | <PackageReference Include="GitInfo" /> |
| 92 | </ItemGroup> | 92 | </ItemGroup> |
| 93 | 93 | ||
| 94 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 94 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 95 | </Project> \ No newline at end of file | 95 | </Project> |
diff --git a/src/ext/ComPlus/ca/packages.config b/src/ext/ComPlus/ca/packages.config deleted file mode 100644 index e3dc0e43..00000000 --- a/src/ext/ComPlus/ca/packages.config +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> | ||
| 4 | <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" /> | ||
| 5 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/ComPlus/complus.cmd b/src/ext/ComPlus/complus.cmd new file mode 100644 index 00000000..bea27765 --- /dev/null +++ b/src/ext/ComPlus/complus.cmd | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | :: Restore | ||
| 7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
| 8 | |||
| 9 | :: Build | ||
| 10 | ::msbuild -p:Configuration=%_C% -p:Platform=Win32 ca\complusca.vcxproj || exit /b | ||
| 11 | ::msbuild -p:Configuration=%_C% -p:Platform=x64 ca\complusca.vcxproj || exit /b | ||
| 12 | |||
| 13 | msbuild -p:Configuration=%_C% test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b | ||
| 14 | |||
| 15 | :: Test | ||
| 16 | dotnet test -c %_C% --no-build test\WixToolsetTest.ComPlus || exit /b | ||
| 17 | |||
| 18 | :: Pack | ||
| 19 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.ComPlus.wixext.csproj || exit /b | ||
| 20 | |||
| 21 | @popd | ||
| 22 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/ComPlus/nuget.config b/src/ext/ComPlus/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/ComPlus/nuget.config +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 11 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 12 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 13 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 16 | </packageSources> | ||
| 17 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj index e4a529cb..b4f241c8 100644 --- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj +++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -20,19 +21,12 @@ | |||
| 20 | </ItemGroup> | 21 | </ItemGroup> |
| 21 | 22 | ||
| 22 | <ItemGroup> | 23 | <ItemGroup> |
| 23 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 24 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 25 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 26 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 27 | </ItemGroup> | 25 | </ItemGroup> |
| 28 | 26 | ||
| 29 | <ItemGroup> | 27 | <ItemGroup> |
| 30 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 28 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 31 | </ItemGroup> | 29 | <PackageReference Include="xunit" /> |
| 32 | 30 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 33 | <ItemGroup> | ||
| 34 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 35 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 36 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 37 | </ItemGroup> | 31 | </ItemGroup> |
| 38 | </Project> | 32 | </Project> |
diff --git a/src/ext/ComPlus/wix.snk b/src/ext/ComPlus/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/ComPlus/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj index 11271ad3..806977b2 100644 --- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj +++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj | |||
| @@ -21,12 +21,7 @@ | |||
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | 22 | ||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
| 24 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | 24 | <PackageReference Include="WixToolset.Data" PrivateAssets="all" /> |
| 25 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 25 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> |
| 26 | </ItemGroup> | ||
| 27 | |||
| 28 | <ItemGroup> | ||
| 29 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> | ||
| 30 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
| 31 | </ItemGroup> | 26 | </ItemGroup> |
| 32 | </Project> | 27 | </Project> |
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec index 3197250b..20712f58 100644 --- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec +++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec | |||
| @@ -14,11 +14,11 @@ | |||
| 14 | </metadata> | 14 | </metadata> |
| 15 | 15 | ||
| 16 | <files> | 16 | <files> |
| 17 | <file src="$projectFolder$$id$.targets" target="build" /> | 17 | <file src="$projectFolder$\$id$.targets" target="build" /> |
| 18 | 18 | ||
| 19 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 19 | <file src="$id$.dll" target="tools" /> |
| 20 | 20 | ||
| 21 | <file src="x86\*.pdb" target="pdbs\x86" /> | 21 | <file src="..\x86\*.pdb" target="pdbs\x86" /> |
| 22 | <file src="x64\*.pdb" target="pdbs\x64" /> | 22 | <file src="..\x64\*.pdb" target="pdbs\x64" /> |
| 23 | </files> | 23 | </files> |
| 24 | </package> | 24 | </package> |
diff --git a/src/ext/ComPlus/wixlib/complus.wixproj b/src/ext/ComPlus/wixlib/complus.wixproj index ef792a13..f0eaebee 100644 --- a/src/ext/ComPlus/wixlib/complus.wixproj +++ b/src/ext/ComPlus/wixlib/complus.wixproj | |||
| @@ -2,7 +2,6 @@ | |||
| 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 | <Project Sdk="WixToolset.Sdk"> | 4 | <Project Sdk="WixToolset.Sdk"> |
| 5 | |||
| 6 | <PropertyGroup> | 5 | <PropertyGroup> |
| 7 | <OutputType>Library</OutputType> | 6 | <OutputType>Library</OutputType> |
| 8 | <BindFiles>true</BindFiles> | 7 | <BindFiles>true</BindFiles> |
| @@ -20,7 +19,7 @@ | |||
| 20 | </ItemGroup> | 19 | </ItemGroup> |
| 21 | 20 | ||
| 22 | <ItemGroup> | 21 | <ItemGroup> |
| 23 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 22 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 23 | <PackageReference Include="GitInfo" /> | ||
| 24 | </ItemGroup> | 24 | </ItemGroup> |
| 25 | |||
| 26 | </Project> | 25 | </Project> |
diff --git a/src/ext/Dependency/Dependency.wixext.sln b/src/ext/Dependency/Dependency.wixext.sln index e771ddf6..7179d48b 100644 --- a/src/ext/Dependency/Dependency.wixext.sln +++ b/src/ext/Dependency/Dependency.wixext.sln | |||
| @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30204.135 | 4 | VisualStudioVersion = 16.0.30204.135 |
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dependencyca", "src\ca\dependencyca.vcxproj", "{B86AF46C-0F90-49CC-923F-A800B088D015}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dependencyca", "ca\dependencyca.vcxproj", "{B86AF46C-0F90-49CC-923F-A800B088D015}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "dependency", "src\wixlib\dependency.wixproj", "{58ED0EC8-73F8-4EE1-8664-A53486D38EC8}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "dependency", "wixlib\dependency.wixproj", "{58ED0EC8-73F8-4EE1-8664-A53486D38EC8}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dependency.wixext", "src\wixext\WixToolset.Dependency.wixext.csproj", "{A0B6D3F1-AE5E-423B-BA92-60C9926CA498}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dependency.wixext", "wixext\WixToolset.Dependency.wixext.csproj", "{A0B6D3F1-AE5E-423B-BA92-60C9926CA498}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Dependency", "src\test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj", "{E2AB6AA2-359D-4305-92B0-D90C8F87AF9B}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Dependency", "test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj", "{E2AB6AA2-359D-4305-92B0-D90C8F87AF9B}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/Dependency/Directory.Build.props b/src/ext/Dependency/Directory.Build.props index b3c6287c..88115b61 100644 --- a/src/ext/Dependency/Directory.Build.props +++ b/src/ext/Dependency/Directory.Build.props | |||
| @@ -1,27 +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>Dependency.wixext</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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | 9 | <Import Project="..\..\Directory.Build.props" /> |
| 26 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 27 | </Project> | 10 | </Project> |
diff --git a/src/ext/Dependency/Directory.Build.targets b/src/ext/Dependency/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/Dependency/Directory.Build.targets +++ /dev/null | |||
| @@ -1,51 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | |||
| 49 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 50 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 51 | </Project> | ||
diff --git a/src/ext/Dependency/Directory.csproj.props b/src/ext/Dependency/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/Dependency/Directory.csproj.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/ext/Dependency/Directory.csproj.targets b/src/ext/Dependency/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/Dependency/Directory.csproj.targets +++ /dev/null | |||
| @@ -1,26 +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\Directory.csproj.targets | ||
| 4 | then update all of the repos. | ||
| 5 | --> | ||
| 6 | <Project> | ||
| 7 | <PropertyGroup> | ||
| 8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 13 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 14 | <PropertyGroup> | ||
| 15 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 16 | |||
| 17 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 18 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath> | ||
| 19 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 20 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 21 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 22 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 23 | </PropertyGroup> | ||
| 24 | </Target> | ||
| 25 | |||
| 26 | </Project> | ||
diff --git a/src/ext/Dependency/Directory.vcxproj.props b/src/ext/Dependency/Directory.vcxproj.props deleted file mode 100644 index 664bc1d8..00000000 --- a/src/ext/Dependency/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,93 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <ItemDefinitionGroup> | ||
| 23 | <ClCompile> | ||
| 24 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 25 | <WarningLevel>Level4</WarningLevel> | ||
| 26 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 27 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 28 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 29 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 30 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 31 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 32 | <ExceptionHandling>false</ExceptionHandling> | ||
| 33 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 34 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 35 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 36 | </ClCompile> | ||
| 37 | <ResourceCompile> | ||
| 38 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 39 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 40 | </ResourceCompile> | ||
| 41 | <Lib> | ||
| 42 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 43 | </Lib> | ||
| 44 | <Link> | ||
| 45 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 46 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 47 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 48 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 49 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 50 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 51 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 52 | </Link> | ||
| 53 | </ItemDefinitionGroup> | ||
| 54 | |||
| 55 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 56 | <ClCompile> | ||
| 57 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 58 | </ClCompile> | ||
| 59 | </ItemDefinitionGroup> | ||
| 60 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 61 | <ClCompile> | ||
| 62 | <CallingConvention>CDecl</CallingConvention> | ||
| 63 | </ClCompile> | ||
| 64 | </ItemDefinitionGroup> | ||
| 65 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 66 | <ClCompile> | ||
| 67 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 68 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 69 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 70 | </ClCompile> | ||
| 71 | </ItemDefinitionGroup> | ||
| 72 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 73 | <ClCompile> | ||
| 74 | <Optimization>Disabled</Optimization> | ||
| 75 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 76 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 78 | </ClCompile> | ||
| 79 | </ItemDefinitionGroup> | ||
| 80 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 81 | <ClCompile> | ||
| 82 | <Optimization>MinSpace</Optimization> | ||
| 83 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 84 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 85 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 86 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 87 | </ClCompile> | ||
| 88 | <Link> | ||
| 89 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 90 | <OptimizeReferences>true</OptimizeReferences> | ||
| 91 | </Link> | ||
| 92 | </ItemDefinitionGroup> | ||
| 93 | </Project> | ||
diff --git a/src/ext/Dependency/appveyor.cmd b/src/ext/Dependency/appveyor.cmd deleted file mode 100644 index 3450d535..00000000 --- a/src/ext/Dependency/appveyor.cmd +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | :: Restore | ||
| 7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
| 8 | |||
| 9 | :: Build | ||
| 10 | msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj || exit /b | ||
| 11 | |||
| 12 | :: Test | ||
| 13 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Dependency || exit /b | ||
| 14 | |||
| 15 | :: Pack | ||
| 16 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Dependency.wixext.csproj || exit /b | ||
| 17 | |||
| 18 | @popd | ||
| 19 | @endlocal | ||
diff --git a/src/ext/Dependency/appveyor.yml b/src/ext/Dependency/appveyor.yml deleted file mode 100644 index c53cc9cc..00000000 --- a/src/ext/Dependency/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\**\*.snupkg | ||
| 37 | name: snupkg | ||
| 38 | |||
| 39 | notifications: | ||
| 40 | - provider: Slack | ||
| 41 | incoming_webhook: | ||
| 42 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/Dependency/ca/dependencyca.vcxproj b/src/ext/Dependency/ca/dependencyca.vcxproj index 2a0760d6..9e31994b 100644 --- a/src/ext/Dependency/ca/dependencyca.vcxproj +++ b/src/ext/Dependency/ca/dependencyca.vcxproj | |||
| @@ -63,10 +63,10 @@ | |||
| 63 | </ItemGroup> | 63 | </ItemGroup> |
| 64 | 64 | ||
| 65 | <ItemGroup> | 65 | <ItemGroup> |
| 66 | <PackageReference Include="WixToolset.Dutil" Version="4.0.72" /> | 66 | <PackageReference Include="WixToolset.Dutil" /> |
| 67 | <PackageReference Include="WixToolset.WcaUtil" Version="4.0.19" /> | 67 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 68 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 68 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 69 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 69 | <PackageReference Include="GitInfo" /> |
| 70 | </ItemGroup> | 70 | </ItemGroup> |
| 71 | 71 | ||
| 72 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 72 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
diff --git a/src/ext/Dependency/dependency.cmd b/src/ext/Dependency/dependency.cmd new file mode 100644 index 00000000..74e72798 --- /dev/null +++ b/src/ext/Dependency/dependency.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 Dependency.wixext build %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.Dependency || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Dependency.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/Dependency/nuget.config b/src/ext/Dependency/nuget.config deleted file mode 100644 index 10ef488d..00000000 --- a/src/ext/Dependency/nuget.config +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 11 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 12 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 13 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 14 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 15 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 16 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 17 | </packageSources> | ||
| 18 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj index 0b80dc83..2e52a062 100644 --- a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj +++ b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <DebugType>embedded</DebugType> | 7 | <DebugType>embedded</DebugType> |
| 8 | <IsPackable>false</IsPackable> | 8 | <IsPackable>false</IsPackable> |
| 9 | <SignOutput>false</SignOutput> | ||
| 9 | </PropertyGroup> | 10 | </PropertyGroup> |
| 10 | 11 | ||
| 11 | <PropertyGroup> | 12 | <PropertyGroup> |
| @@ -21,19 +22,12 @@ | |||
| 21 | </ItemGroup> | 22 | </ItemGroup> |
| 22 | 23 | ||
| 23 | <ItemGroup> | 24 | <ItemGroup> |
| 24 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 25 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 25 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 26 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 27 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 28 | </ItemGroup> | 26 | </ItemGroup> |
| 29 | 27 | ||
| 30 | <ItemGroup> | 28 | <ItemGroup> |
| 31 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 29 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 32 | </ItemGroup> | 30 | <PackageReference Include="xunit" /> |
| 33 | 31 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 34 | <ItemGroup> | ||
| 35 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 36 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 37 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 38 | </ItemGroup> | 32 | </ItemGroup> |
| 39 | </Project> | 33 | </Project> |
diff --git a/src/ext/Dependency/wix.snk b/src/ext/Dependency/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/Dependency/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj index b2663231..58375065 100644 --- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj +++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj | |||
| @@ -21,12 +21,7 @@ | |||
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | 22 | ||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
| 24 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | 24 | <PackageReference Include="WixToolset.Data" PrivateAssets="All" /> |
| 25 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 25 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" /> |
| 26 | </ItemGroup> | ||
| 27 | |||
| 28 | <ItemGroup> | ||
| 29 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> | ||
| 30 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
| 31 | </ItemGroup> | 26 | </ItemGroup> |
| 32 | </Project> | 27 | </Project> |
diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec index ba3eaade..da07f591 100644 --- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec +++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | </metadata> | 14 | </metadata> |
| 15 | 15 | ||
| 16 | <files> | 16 | <files> |
| 17 | <file src="$projectFolder$$id$.targets" target="build" /> | 17 | <file src="$projectFolder$\$id$.targets" target="build" /> |
| 18 | 18 | ||
| 19 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 19 | <file src="$id$.dll" target="tools" /> |
| 20 | 20 | ||
| 21 | <file src="ARM64\*.pdb" target="pdbs\ARM64" /> | 21 | <file src="..\ARM64\*.pdb" target="pdbs\ARM64" /> |
| 22 | <file src="x86\*.pdb" target="pdbs\x86" /> | 22 | <file src="..\x86\*.pdb" target="pdbs\x86" /> |
| 23 | <file src="x64\*.pdb" target="pdbs\x64" /> | 23 | <file src="..\x64\*.pdb" target="pdbs\x64" /> |
| 24 | </files> | 24 | </files> |
| 25 | </package> | 25 | </package> |
diff --git a/src/ext/Dependency/wixlib/dependency.wixproj b/src/ext/Dependency/wixlib/dependency.wixproj index 76e3ecd3..cd30f666 100644 --- a/src/ext/Dependency/wixlib/dependency.wixproj +++ b/src/ext/Dependency/wixlib/dependency.wixproj | |||
| @@ -2,7 +2,6 @@ | |||
| 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 | <Project Sdk="WixToolset.Sdk"> | 4 | <Project Sdk="WixToolset.Sdk"> |
| 5 | |||
| 6 | <PropertyGroup> | 5 | <PropertyGroup> |
| 7 | <OutputType>Library</OutputType> | 6 | <OutputType>Library</OutputType> |
| 8 | <BindFiles>true</BindFiles> | 7 | <BindFiles>true</BindFiles> |
| @@ -24,7 +23,7 @@ | |||
| 24 | </ItemGroup> | 23 | </ItemGroup> |
| 25 | 24 | ||
| 26 | <ItemGroup> | 25 | <ItemGroup> |
| 27 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 26 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 27 | <PackageReference Include="GitInfo" /> | ||
| 28 | </ItemGroup> | 28 | </ItemGroup> |
| 29 | |||
| 30 | </Project> | 29 | </Project> |
diff --git a/src/ext/DifxApp/CSharp.Build.props b/src/ext/DifxApp/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/DifxApp/CSharp.Build.props +++ /dev/null | |||
| @@ -1,11 +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 | <SignAssembly>true</SignAssembly> | ||
| 9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | </Project> | ||
diff --git a/src/ext/DifxApp/DifxApp.wixext.sln b/src/ext/DifxApp/DifxApp.wixext.sln index 2b891405..d212c773 100644 --- a/src/ext/DifxApp/DifxApp.wixext.sln +++ b/src/ext/DifxApp/DifxApp.wixext.sln | |||
| @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30611.23 | 4 | VisualStudioVersion = 16.0.30611.23 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "difxapp", "src\wixlib\difxapp.wixproj", "{5066EB93-D8F7-4FAE-B687-024D7A81BD95}" | 6 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "difxapp", "wixlib\difxapp.wixproj", "{5066EB93-D8F7-4FAE-B687-024D7A81BD95}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DifxApp.wixext", "src\wixext\WixToolset.DifxApp.wixext.csproj", "{2256EFD7-E678-4485-818D-986D590068BE}" | 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DifxApp.wixext", "wixext\WixToolset.DifxApp.wixext.csproj", "{2256EFD7-E678-4485-818D-986D590068BE}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DifxApp", "src\test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj", "{883D7BA3-1ADC-47AC-95B0-221BB0B7788D}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DifxApp", "test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj", "{883D7BA3-1ADC-47AC-95B0-221BB0B7788D}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Global | 12 | Global |
| 13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/DifxApp/Directory.Build.props b/src/ext/DifxApp/Directory.Build.props index f83cc154..4697cf0c 100644 --- a/src/ext/DifxApp/Directory.Build.props +++ b/src/ext/DifxApp/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>DifxApp.wixext</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/ext/DifxApp/Directory.Build.targets b/src/ext/DifxApp/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/DifxApp/Directory.Build.targets +++ /dev/null | |||
| @@ -1,48 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | </Project> | ||
diff --git a/src/ext/DifxApp/appveyor.cmd b/src/ext/DifxApp/appveyor.cmd deleted file mode 100644 index ec37397e..00000000 --- a/src/ext/DifxApp/appveyor.cmd +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | nuget restore || exit /b | ||
| 5 | |||
| 6 | msbuild -p:Configuration=Release -t:Restore || exit /b | ||
| 7 | |||
| 8 | msbuild -p:Configuration=Release src\test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj || exit /b | ||
| 9 | dotnet test -c Release --no-build src\test\WixToolsetTest.DifxApp || exit /b | ||
| 10 | |||
| 11 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.DifxApp.wixext.csproj || exit /b | ||
| 12 | |||
| 13 | @popd | ||
| 14 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/DifxApp/appveyor.yml b/src/ext/DifxApp/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/DifxApp/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/DifxApp/difxapp.cmd b/src/ext/DifxApp/difxapp.cmd new file mode 100644 index 00000000..754ec455 --- /dev/null +++ b/src/ext/DifxApp/difxapp.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 Dependency.wixext build %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.DifxApp || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.DifxApp.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/DifxApp/nuget.config b/src/ext/DifxApp/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/DifxApp/nuget.config +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 11 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 12 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 13 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 16 | </packageSources> | ||
| 17 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj index e205d24a..8428a280 100644 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj +++ b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -23,19 +24,12 @@ | |||
| 23 | </ItemGroup> | 24 | </ItemGroup> |
| 24 | 25 | ||
| 25 | <ItemGroup> | 26 | <ItemGroup> |
| 26 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 27 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 27 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 28 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 29 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 30 | </ItemGroup> | 28 | </ItemGroup> |
| 31 | 29 | ||
| 32 | <ItemGroup> | 30 | <ItemGroup> |
| 33 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 31 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 34 | </ItemGroup> | 32 | <PackageReference Include="xunit" /> |
| 35 | 33 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 36 | <ItemGroup> | ||
| 37 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 38 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 39 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 40 | </ItemGroup> | 34 | </ItemGroup> |
| 41 | </Project> | 35 | </Project> |
diff --git a/src/ext/DifxApp/wix.snk b/src/ext/DifxApp/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/DifxApp/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj index 50d3debf..4000d4b3 100644 --- a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj +++ b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj | |||
| @@ -10,19 +10,17 @@ | |||
| 10 | <IsTool>true</IsTool> | 10 | <IsTool>true</IsTool> |
| 11 | <ContentTargetFolders>build</ContentTargetFolders> | 11 | <ContentTargetFolders>build</ContentTargetFolders> |
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | |||
| 13 | <ItemGroup> | 14 | <ItemGroup> |
| 14 | <Content Include="$(MSBuildThisFileName).targets" /> | 15 | <Content Include="$(MSBuildThisFileName).targets" /> |
| 15 | <EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" /> | 16 | <EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" /> |
| 16 | </ItemGroup> | 17 | </ItemGroup> |
| 17 | <ItemGroup> | ||
| 18 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | ||
| 19 | </ItemGroup> | ||
| 20 | 18 | ||
| 21 | <ItemGroup> | 19 | <ItemGroup> |
| 22 | <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 20 | <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> |
| 23 | </ItemGroup> | 21 | </ItemGroup> |
| 24 | 22 | ||
| 25 | <ItemGroup> | 23 | <ItemGroup> |
| 26 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 24 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> |
| 27 | </ItemGroup> | 25 | </ItemGroup> |
| 28 | </Project> | 26 | </Project> |
diff --git a/src/ext/DifxApp/wixlib/difxapp.wixproj b/src/ext/DifxApp/wixlib/difxapp.wixproj index 2ae9a097..71e88ffc 100644 --- a/src/ext/DifxApp/wixlib/difxapp.wixproj +++ b/src/ext/DifxApp/wixlib/difxapp.wixproj | |||
| @@ -1,6 +1,5 @@ | |||
| 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 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | |||
| 4 | <PropertyGroup> | 3 | <PropertyGroup> |
| 5 | <OutputType>Library</OutputType> | 4 | <OutputType>Library</OutputType> |
| 6 | <BindFiles>true</BindFiles> | 5 | <BindFiles>true</BindFiles> |
| @@ -8,7 +7,7 @@ | |||
| 8 | </PropertyGroup> | 7 | </PropertyGroup> |
| 9 | 8 | ||
| 10 | <ItemGroup> | 9 | <ItemGroup> |
| 11 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 10 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 11 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | |||
| 14 | </Project> | 13 | </Project> |
diff --git a/src/ext/DirectX/CSharp.Build.props b/src/ext/DirectX/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/DirectX/CSharp.Build.props +++ /dev/null | |||
| @@ -1,11 +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 | <SignAssembly>true</SignAssembly> | ||
| 9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | </Project> | ||
diff --git a/src/ext/DirectX/Cpp.Build.props b/src/ext/DirectX/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/DirectX/Cpp.Build.props +++ /dev/null | |||
| @@ -1,86 +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)'=='Release' "> | ||
| 74 | <ClCompile> | ||
| 75 | <Optimization>MinSpace</Optimization> | ||
| 76 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 78 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 79 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 80 | </ClCompile> | ||
| 81 | <Link> | ||
| 82 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 83 | <OptimizeReferences>true</OptimizeReferences> | ||
| 84 | </Link> | ||
| 85 | </ItemDefinitionGroup> | ||
| 86 | </Project> | ||
diff --git a/src/ext/DirectX/DirectX.wixext.sln b/src/ext/DirectX/DirectX.wixext.sln index 2ec5721f..6315616a 100644 --- a/src/ext/DirectX/DirectX.wixext.sln +++ b/src/ext/DirectX/DirectX.wixext.sln | |||
| @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30204.135 | 4 | VisualStudioVersion = 16.0.30204.135 |
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directxca", "src\ca\directxca.vcxproj", "{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "directxca", "ca\directxca.vcxproj", "{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "directx", "src\wixlib\directx.wixproj", "{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "directx", "wixlib\directx.wixproj", "{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DirectX.wixext", "src\wixext\WixToolset.DirectX.wixext.csproj", "{6182DBCA-146A-4F37-8406-3139BBE04636}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DirectX.wixext", "wixext\WixToolset.DirectX.wixext.csproj", "{6182DBCA-146A-4F37-8406-3139BBE04636}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DirectX", "src\test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj", "{508A3DD0-FE58-4150-A1F6-A803A377012A}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DirectX", "test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj", "{508A3DD0-FE58-4150-A1F6-A803A377012A}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/DirectX/Directory.Build.props b/src/ext/DirectX/Directory.Build.props index f83cc154..7820eb98 100644 --- a/src/ext/DirectX/Directory.Build.props +++ b/src/ext/DirectX/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>DirectX.wixext</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/ext/DirectX/Directory.Build.targets b/src/ext/DirectX/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/DirectX/Directory.Build.targets +++ /dev/null | |||
| @@ -1,48 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | </Project> | ||
diff --git a/src/ext/DirectX/appveyor.cmd b/src/ext/DirectX/appveyor.cmd deleted file mode 100644 index 3a7e2d72..00000000 --- a/src/ext/DirectX/appveyor.cmd +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | nuget restore || exit /b | ||
| 5 | |||
| 6 | msbuild -p:Configuration=Release -t:Restore || exit /b | ||
| 7 | |||
| 8 | msbuild -p:Configuration=Release src\test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj || exit /b | ||
| 9 | dotnet test -c Release --no-build src\test\WixToolsetTest.DirectX || exit /b | ||
| 10 | |||
| 11 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.DirectX.wixext.csproj || exit /b | ||
| 12 | |||
| 13 | @popd | ||
| 14 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/DirectX/appveyor.yml b/src/ext/DirectX/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/DirectX/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/DirectX/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj index e772009a..85ce0828 100644 --- a/src/ext/DirectX/ca/directxca.vcxproj +++ b/src/ext/DirectX/ca/directxca.vcxproj | |||
| @@ -1,9 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | |||
| 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> | ||
| 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" /> | ||
| 6 | |||
| 7 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 8 | <ProjectConfiguration Include="Debug|Win32"> | 6 | <ProjectConfiguration Include="Debug|Win32"> |
| 9 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -30,7 +28,7 @@ | |||
| 30 | <Platform>ARM64</Platform> | 28 | <Platform>ARM64</Platform> |
| 31 | </ProjectConfiguration> | 29 | </ProjectConfiguration> |
| 32 | </ItemGroup> | 30 | </ItemGroup> |
| 33 | 31 | ||
| 34 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
| 35 | <ProjectGuid>{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}</ProjectGuid> | 33 | <ProjectGuid>{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}</ProjectGuid> |
| 36 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 34 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| @@ -40,14 +38,14 @@ | |||
| 40 | <ProjectModuleDefinitionFile>directx.def</ProjectModuleDefinitionFile> | 38 | <ProjectModuleDefinitionFile>directx.def</ProjectModuleDefinitionFile> |
| 41 | <Description>WiX Toolset DirectX CustomAction</Description> | 39 | <Description>WiX Toolset DirectX CustomAction</Description> |
| 42 | </PropertyGroup> | 40 | </PropertyGroup> |
| 43 | 41 | ||
| 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 46 | 44 | ||
| 47 | <PropertyGroup> | 45 | <PropertyGroup> |
| 48 | <ProjectAdditionalLinkLibraries>d3d9.lib;msi.lib</ProjectAdditionalLinkLibraries> | 46 | <ProjectAdditionalLinkLibraries>d3d9.lib;msi.lib</ProjectAdditionalLinkLibraries> |
| 49 | </PropertyGroup> | 47 | </PropertyGroup> |
| 50 | 48 | ||
| 51 | <ItemGroup> | 49 | <ItemGroup> |
| 52 | <ClCompile Include="directx.cpp" /> | 50 | <ClCompile Include="directx.cpp" /> |
| 53 | <ClCompile Include="dllmain.cpp"> | 51 | <ClCompile Include="dllmain.cpp"> |
| @@ -57,14 +55,13 @@ | |||
| 57 | <None Include="directx.def" /> | 55 | <None Include="directx.def" /> |
| 58 | <None Include="packages.config" /> | 56 | <None Include="packages.config" /> |
| 59 | </ItemGroup> | 57 | </ItemGroup> |
| 60 | 58 | ||
| 59 | <ItemGroup> | ||
| 60 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 61 | <PackageReference Include="WixToolset.WcaUtil" /> | ||
| 62 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | ||
| 63 | <PackageReference Include="GitInfo" /> | ||
| 64 | </ItemGroup> | ||
| 65 | |||
| 61 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 66 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 62 | 67 | </Project> | |
| 63 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 64 | <PropertyGroup> | ||
| 65 | <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> | ||
| 66 | </PropertyGroup> | ||
| 67 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" /> | ||
| 68 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" /> | ||
| 69 | </Target> | ||
| 70 | </Project> \ No newline at end of file | ||
diff --git a/src/ext/DirectX/ca/packages.config b/src/ext/DirectX/ca/packages.config index e3dc0e43..6e8da8cb 100644 --- a/src/ext/DirectX/ca/packages.config +++ b/src/ext/DirectX/ca/packages.config | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <packages> | 2 | <packages> |
| 3 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> | 3 | <package id="WixToolset.DUtil" version="4.0.0-preview.0-build.1" targetFramework="native" /> |
| 4 | <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" /> | 4 | <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" /> |
| 5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |
diff --git a/src/ext/DirectX/directx.cmd b/src/ext/DirectX/directx.cmd new file mode 100644 index 00000000..1e1baba8 --- /dev/null +++ b/src/ext/DirectX/directx.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 DirectX.wixext build %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.DirectX || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.DirectX.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/DirectX/nuget.config b/src/ext/DirectX/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/DirectX/nuget.config +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 11 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 12 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 13 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 16 | </packageSources> | ||
| 17 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj index 1722a613..59d58089 100644 --- a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -23,19 +24,12 @@ | |||
| 23 | </ItemGroup> | 24 | </ItemGroup> |
| 24 | 25 | ||
| 25 | <ItemGroup> | 26 | <ItemGroup> |
| 26 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 27 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 27 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 28 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 29 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 30 | </ItemGroup> | 28 | </ItemGroup> |
| 31 | 29 | ||
| 32 | <ItemGroup> | 30 | <ItemGroup> |
| 33 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 31 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 34 | </ItemGroup> | 32 | <PackageReference Include="xunit" /> |
| 35 | 33 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 36 | <ItemGroup> | ||
| 37 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 38 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 39 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 40 | </ItemGroup> | 34 | </ItemGroup> |
| 41 | </Project> | 35 | </Project> |
diff --git a/src/ext/DirectX/wix.snk b/src/ext/DirectX/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/DirectX/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj index a848ff9a..4a5a398e 100644 --- a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj +++ b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj | |||
| @@ -17,15 +17,11 @@ | |||
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | 20 | <PackageReference Include="WixToolset.Data" PrivateAssets="All" /> |
| 21 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 21 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" /> |
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | 23 | ||
| 24 | <ItemGroup> | 24 | <ItemGroup> |
| 25 | <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 25 | <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> |
| 26 | </ItemGroup> | 26 | </ItemGroup> |
| 27 | |||
| 28 | <ItemGroup> | ||
| 29 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> | ||
| 30 | </ItemGroup> | ||
| 31 | </Project> | 27 | </Project> |
diff --git a/src/ext/DirectX/wixlib/directx.wixproj b/src/ext/DirectX/wixlib/directx.wixproj index bdad24a4..a7281dd0 100644 --- a/src/ext/DirectX/wixlib/directx.wixproj +++ b/src/ext/DirectX/wixlib/directx.wixproj | |||
| @@ -4,10 +4,13 @@ | |||
| 4 | <OutputType>Library</OutputType> | 4 | <OutputType>Library</OutputType> |
| 5 | <BindFiles>true</BindFiles> | 5 | <BindFiles>true</BindFiles> |
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | |||
| 7 | <ItemGroup> | 8 | <ItemGroup> |
| 8 | <ProjectReference Include="..\ca\directxca.vcxproj" /> | 9 | <ProjectReference Include="..\ca\directxca.vcxproj" ReferenceOutputAssembly="false" /> |
| 9 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | |||
| 10 | <ItemGroup> | 12 | <ItemGroup> |
| 11 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> | 13 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 14 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 12 | </ItemGroup> | 15 | </ItemGroup> |
| 13 | </Project> \ No newline at end of file | 16 | </Project> |
diff --git a/src/ext/Firewall/CSharp.Build.props b/src/ext/Firewall/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/Firewall/CSharp.Build.props +++ /dev/null | |||
| @@ -1,11 +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 | <SignAssembly>true</SignAssembly> | ||
| 9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | </Project> | ||
diff --git a/src/ext/Firewall/Cpp.Build.props b/src/ext/Firewall/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/Firewall/Cpp.Build.props +++ /dev/null | |||
| @@ -1,86 +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)'=='Release' "> | ||
| 74 | <ClCompile> | ||
| 75 | <Optimization>MinSpace</Optimization> | ||
| 76 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 78 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 79 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 80 | </ClCompile> | ||
| 81 | <Link> | ||
| 82 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 83 | <OptimizeReferences>true</OptimizeReferences> | ||
| 84 | </Link> | ||
| 85 | </ItemDefinitionGroup> | ||
| 86 | </Project> | ||
diff --git a/src/ext/Firewall/Directory.Build.props b/src/ext/Firewall/Directory.Build.props index f83cc154..a2d81c40 100644 --- a/src/ext/Firewall/Directory.Build.props +++ b/src/ext/Firewall/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>Firewall.wixext</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/ext/Firewall/Directory.Build.targets b/src/ext/Firewall/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/Firewall/Directory.Build.targets +++ /dev/null | |||
| @@ -1,48 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | </Project> | ||
diff --git a/src/ext/Firewall/Firewall.wixext.sln b/src/ext/Firewall/Firewall.wixext.sln index 59209c88..02bb8c0f 100644 --- a/src/ext/Firewall/Firewall.wixext.sln +++ b/src/ext/Firewall/Firewall.wixext.sln | |||
| @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio 15 | 3 | # Visual Studio 15 |
| 4 | VisualStudioVersion = 15.0.27130.2003 | 4 | VisualStudioVersion = 15.0.27130.2003 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fwca", "src\ca\fwca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fwca", "ca\fwca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "firewall", "src\wixlib\firewall.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "firewall", "wixlib\firewall.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Firewall.wixext", "src\wixext\WixToolset.Firewall.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Firewall.wixext", "wixext\WixToolset.Firewall.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Firewall", "src\test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Firewall", "test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/Firewall/appveyor.cmd b/src/ext/Firewall/appveyor.cmd deleted file mode 100644 index 79c24cc1..00000000 --- a/src/ext/Firewall/appveyor.cmd +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | nuget restore || exit /b | ||
| 5 | |||
| 6 | msbuild -p:Configuration=Release -t:Restore || exit /b | ||
| 7 | |||
| 8 | msbuild -p:Configuration=Release src\test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj || exit /b | ||
| 9 | dotnet test -c Release --no-build src\test\WixToolsetTest.Firewall || exit /b | ||
| 10 | |||
| 11 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Firewall.wixext.csproj || exit /b | ||
| 12 | |||
| 13 | @popd | ||
| 14 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/Firewall/appveyor.yml b/src/ext/Firewall/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Firewall/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/Firewall/ca/fwca.vcxproj b/src/ext/Firewall/ca/fwca.vcxproj index 5e9a1db6..38497d97 100644 --- a/src/ext/Firewall/ca/fwca.vcxproj +++ b/src/ext/Firewall/ca/fwca.vcxproj | |||
| @@ -2,9 +2,6 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" /> | ||
| 6 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" /> | ||
| 7 | |||
| 8 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 9 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 10 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -66,16 +63,14 @@ | |||
| 66 | 63 | ||
| 67 | <ItemGroup> | 64 | <ItemGroup> |
| 68 | <None Include="fwca.def" /> | 65 | <None Include="fwca.def" /> |
| 69 | <None Include="packages.config" /> | ||
| 70 | </ItemGroup> | 66 | </ItemGroup> |
| 71 | 67 | ||
| 72 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 68 | <ItemGroup> |
| 69 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 70 | <PackageReference Include="WixToolset.WcaUtil" /> | ||
| 71 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | ||
| 72 | <PackageReference Include="GitInfo" /> | ||
| 73 | </ItemGroup> | ||
| 73 | 74 | ||
| 74 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 75 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 75 | <PropertyGroup> | ||
| 76 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | ||
| 77 | </PropertyGroup> | ||
| 78 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" /> | ||
| 79 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props'))" /> | ||
| 80 | </Target> | ||
| 81 | </Project> | 76 | </Project> |
diff --git a/src/ext/Firewall/ca/packages.config b/src/ext/Firewall/ca/packages.config deleted file mode 100644 index 9d88f529..00000000 --- a/src/ext/Firewall/ca/packages.config +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" /> | ||
| 4 | <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" /> | ||
| 5 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/Firewall/firewall.cmd b/src/ext/Firewall/firewall.cmd new file mode 100644 index 00000000..a735aa23 --- /dev/null +++ b/src/ext/Firewall/firewall.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 Firewall.wixext build %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.Firewall || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Firewall.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/Firewall/nuget.config b/src/ext/Firewall/nuget.config deleted file mode 100644 index aaf36562..00000000 --- a/src/ext/Firewall/nuget.config +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 11 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 12 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 13 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 14 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 15 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 16 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 17 | </packageSources> | ||
| 18 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj index d04368c1..c291c7f9 100644 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj +++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -12,14 +13,7 @@ | |||
| 12 | </PropertyGroup> | 13 | </PropertyGroup> |
| 13 | 14 | ||
| 14 | <ItemGroup> | 15 | <ItemGroup> |
| 15 | <Content Include="TestData\UsingFirewall\example.txt" CopyToOutputDirectory="PreserveNewest" /> | 16 | <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" /> |
| 16 | <Content Include="TestData\UsingFirewall\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | ||
| 17 | <Content Include="TestData\UsingFirewall\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 18 | <Content Include="TestData\UsingFirewall\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 19 | <Content Include="TestData\UsingOutboundFirewall\example.txt" CopyToOutputDirectory="PreserveNewest" /> | ||
| 20 | <Content Include="TestData\UsingOutboundFirewall\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | ||
| 21 | <Content Include="TestData\UsingOutboundFirewall\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 22 | <Content Include="TestData\UsingOutboundFirewall\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 23 | </ItemGroup> | 17 | </ItemGroup> |
| 24 | 18 | ||
| 25 | <ItemGroup> | 19 | <ItemGroup> |
| @@ -27,19 +21,12 @@ | |||
| 27 | </ItemGroup> | 21 | </ItemGroup> |
| 28 | 22 | ||
| 29 | <ItemGroup> | 23 | <ItemGroup> |
| 30 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 31 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 32 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 33 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 34 | </ItemGroup> | 25 | </ItemGroup> |
| 35 | 26 | ||
| 36 | <ItemGroup> | 27 | <ItemGroup> |
| 37 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 28 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 38 | </ItemGroup> | 29 | <PackageReference Include="xunit" /> |
| 39 | 30 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 40 | <ItemGroup> | ||
| 41 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 42 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 43 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 44 | </ItemGroup> | 31 | </ItemGroup> |
| 45 | </Project> | 32 | </Project> |
diff --git a/src/ext/Firewall/wix.snk b/src/ext/Firewall/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/Firewall/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj index 6704dad2..43164950 100644 --- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj +++ b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj | |||
| @@ -17,15 +17,11 @@ | |||
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | 20 | <PackageReference Include="WixToolset.Data" PrivateAssets="All" /> |
| 21 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 21 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" /> |
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | 23 | ||
| 24 | <ItemGroup> | 24 | <ItemGroup> |
| 25 | <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 25 | <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> |
| 26 | </ItemGroup> | 26 | </ItemGroup> |
| 27 | |||
| 28 | <ItemGroup> | ||
| 29 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
| 30 | </ItemGroup> | ||
| 31 | </Project> | 27 | </Project> |
diff --git a/src/ext/Firewall/wixlib/firewall.wixproj b/src/ext/Firewall/wixlib/firewall.wixproj index 242fa56e..2230ee0d 100644 --- a/src/ext/Firewall/wixlib/firewall.wixproj +++ b/src/ext/Firewall/wixlib/firewall.wixproj | |||
| @@ -14,13 +14,13 @@ | |||
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | 15 | ||
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" /> | 17 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> |
| 18 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" /> | 18 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> |
| 19 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" /> | 19 | <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | 21 | ||
| 22 | <ItemGroup> | 22 | <ItemGroup> |
| 23 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 23 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 24 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 24 | </ItemGroup> | 25 | </ItemGroup> |
| 25 | |||
| 26 | </Project> | 26 | </Project> |
diff --git a/src/ext/Http/CSharp.Build.props b/src/ext/Http/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/Http/CSharp.Build.props +++ /dev/null | |||
| @@ -1,11 +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 | <SignAssembly>true</SignAssembly> | ||
| 9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | </Project> | ||
diff --git a/src/ext/Http/Cpp.Build.props b/src/ext/Http/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/Http/Cpp.Build.props +++ /dev/null | |||
| @@ -1,86 +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)'=='Release' "> | ||
| 74 | <ClCompile> | ||
| 75 | <Optimization>MinSpace</Optimization> | ||
| 76 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 78 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 79 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 80 | </ClCompile> | ||
| 81 | <Link> | ||
| 82 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 83 | <OptimizeReferences>true</OptimizeReferences> | ||
| 84 | </Link> | ||
| 85 | </ItemDefinitionGroup> | ||
| 86 | </Project> | ||
diff --git a/src/ext/Http/Directory.Build.props b/src/ext/Http/Directory.Build.props index f83cc154..f2a12aa3 100644 --- a/src/ext/Http/Directory.Build.props +++ b/src/ext/Http/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>Http.wixext</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/ext/Http/Directory.Build.targets b/src/ext/Http/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/Http/Directory.Build.targets +++ /dev/null | |||
| @@ -1,48 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | </Project> | ||
diff --git a/src/ext/Http/FindLocalWix.props b/src/ext/Http/FindLocalWix.props deleted file mode 100644 index 1666e4fe..00000000 --- a/src/ext/Http/FindLocalWix.props +++ /dev/null | |||
| @@ -1,8 +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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 5 | <PropertyGroup> | ||
| 6 | <WixTargetsPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Tools\README.md') And Exists('$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets') ">$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets</WixTargetsPath> | ||
| 7 | </PropertyGroup> | ||
| 8 | </Project> | ||
diff --git a/src/ext/Http/Http.wixext.sln b/src/ext/Http/Http.wixext.sln index fe5c52e9..08e9a833 100644 --- a/src/ext/Http/Http.wixext.sln +++ b/src/ext/Http/Http.wixext.sln | |||
| @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30204.135 | 4 | VisualStudioVersion = 16.0.30204.135 |
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpca", "src\ca\httpca.vcxproj", "{90743805-C043-47C7-B5FF-8F5EE5C8A2DE}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpca", "ca\httpca.vcxproj", "{90743805-C043-47C7-B5FF-8F5EE5C8A2DE}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "http", "src\wixlib\http.wixproj", "{055C1517-4CED-4199-BCDE-A383E5C4EF78}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "http", "wixlib\http.wixproj", "{055C1517-4CED-4199-BCDE-A383E5C4EF78}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Http.wixext", "src\wixext\WixToolset.Http.wixext.csproj", "{AAFC3C7F-D818-4B1D-AF3F-A331EA917F3F}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Http.wixext", "wixext\WixToolset.Http.wixext.csproj", "{AAFC3C7F-D818-4B1D-AF3F-A331EA917F3F}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Http", "src\test\WixToolsetTest.Http\WixToolsetTest.Http.csproj", "{6379EBAA-B5FE-4468-89A3-EF0B5D30B87E}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Http", "test\WixToolsetTest.Http\WixToolsetTest.Http.csproj", "{6379EBAA-B5FE-4468-89A3-EF0B5D30B87E}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global` |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
| 16 | Debug|Any CPU = Debug|Any CPU | 16 | Debug|Any CPU = Debug|Any CPU |
| 17 | Debug|x86 = Debug|x86 | 17 | Debug|x86 = Debug|x86 |
diff --git a/src/ext/Http/appveyor.cmd b/src/ext/Http/appveyor.cmd deleted file mode 100644 index 16a34ff9..00000000 --- a/src/ext/Http/appveyor.cmd +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | nuget restore || exit /b | ||
| 5 | |||
| 6 | msbuild -p:Configuration=Release -t:Restore || exit /b | ||
| 7 | |||
| 8 | msbuild -p:Configuration=Release src\test\WixToolsetTest.Http\WixToolsetTest.Http.csproj || exit /b | ||
| 9 | dotnet test -c Release --no-build src\test\WixToolsetTest.Http || exit /b | ||
| 10 | |||
| 11 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Http.wixext.csproj || exit /b | ||
| 12 | |||
| 13 | @popd | ||
| 14 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/Http/appveyor.yml b/src/ext/Http/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Http/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/Http/ca/httpca.vcxproj b/src/ext/Http/ca/httpca.vcxproj index fde00ff4..3a17b3b0 100644 --- a/src/ext/Http/ca/httpca.vcxproj +++ b/src/ext/Http/ca/httpca.vcxproj | |||
| @@ -1,9 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" /> | ||
| 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" /> | ||
| 6 | 3 | ||
| 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 7 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 8 | <ProjectConfiguration Include="Debug|Win32"> | 6 | <ProjectConfiguration Include="Debug|Win32"> |
| 9 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -54,19 +52,23 @@ | |||
| 54 | </ClCompile> | 52 | </ClCompile> |
| 55 | <ClCompile Include="snisslcert.cpp" /> | 53 | <ClCompile Include="snisslcert.cpp" /> |
| 56 | <ClCompile Include="wixhttpca.cpp" /> | 54 | <ClCompile Include="wixhttpca.cpp" /> |
| 55 | </ItemGroup> | ||
| 56 | |||
| 57 | <ItemGroup> | ||
| 57 | <ClInclude Include="cost.h" /> | 58 | <ClInclude Include="cost.h" /> |
| 58 | <ClInclude Include="precomp.h" /> | 59 | <ClInclude Include="precomp.h" /> |
| 59 | <None Include="packages.config" /> | 60 | </ItemGroup> |
| 61 | |||
| 62 | <ItemGroup> | ||
| 60 | <None Include="wixhttpca.def" /> | 63 | <None Include="wixhttpca.def" /> |
| 61 | </ItemGroup> | 64 | </ItemGroup> |
| 62 | 65 | ||
| 63 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 66 | <ItemGroup> |
| 67 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 68 | <PackageReference Include="WixToolset.WcaUtil" /> | ||
| 69 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | ||
| 70 | <PackageReference Include="GitInfo" /> | ||
| 71 | </ItemGroup> | ||
| 64 | 72 | ||
| 65 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 73 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 66 | <PropertyGroup> | ||
| 67 | <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 | </PropertyGroup> | ||
| 69 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" /> | ||
| 70 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props'))" /> | ||
| 71 | </Target> | ||
| 72 | </Project> | 74 | </Project> |
diff --git a/src/ext/Http/ca/packages.config b/src/ext/Http/ca/packages.config deleted file mode 100644 index 9d88f529..00000000 --- a/src/ext/Http/ca/packages.config +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" /> | ||
| 4 | <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" /> | ||
| 5 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/Http/http.cmd b/src/ext/Http/http.cmd new file mode 100644 index 00000000..e1994af3 --- /dev/null +++ b/src/ext/Http/http.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 Http.wixext build %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Http\WixToolsetTest.Http.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.Http || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Http.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/Http/nuget.config b/src/ext/Http/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/Http/nuget.config +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 11 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 12 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 13 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 16 | </packageSources> | ||
| 17 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj index 7e60e426..55a6b654 100644 --- a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj +++ b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -20,19 +21,12 @@ | |||
| 20 | </ItemGroup> | 21 | </ItemGroup> |
| 21 | 22 | ||
| 22 | <ItemGroup> | 23 | <ItemGroup> |
| 23 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 24 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 25 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 26 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 27 | </ItemGroup> | 25 | </ItemGroup> |
| 28 | 26 | ||
| 29 | <ItemGroup> | 27 | <ItemGroup> |
| 30 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 28 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 31 | </ItemGroup> | 29 | <PackageReference Include="xunit" /> |
| 32 | 30 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 33 | <ItemGroup> | ||
| 34 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 35 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 36 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 37 | </ItemGroup> | 31 | </ItemGroup> |
| 38 | </Project> | 32 | </Project> |
diff --git a/src/ext/Http/wix.snk b/src/ext/Http/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/Http/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj index 089a51d0..cfa874a0 100644 --- a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj +++ b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj | |||
| @@ -17,15 +17,11 @@ | |||
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | 20 | <PackageReference Include="WixToolset.Data" PrivateAssets="all" /> |
| 21 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 21 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> |
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | 23 | ||
| 24 | <ItemGroup> | 24 | <ItemGroup> |
| 25 | <ProjectReference Include="..\wixlib\http.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 25 | <ProjectReference Include="..\wixlib\http.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> |
| 26 | </ItemGroup> | 26 | </ItemGroup> |
| 27 | |||
| 28 | <ItemGroup> | ||
| 29 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
| 30 | </ItemGroup> | ||
| 31 | </Project> | 27 | </Project> |
diff --git a/src/ext/Http/wixlib/http.wixproj b/src/ext/Http/wixlib/http.wixproj index 999b7334..651a32ef 100644 --- a/src/ext/Http/wixlib/http.wixproj +++ b/src/ext/Http/wixlib/http.wixproj | |||
| @@ -13,12 +13,13 @@ | |||
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=ARM64" /> | 16 | <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> |
| 17 | <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=x86" /> | 17 | <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> |
| 18 | <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=x64" /> | 18 | <ProjectReference Include="..\ca\httpca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | 20 | ||
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 22 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 23 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 23 | </ItemGroup> | 24 | </ItemGroup> |
| 24 | </Project> \ No newline at end of file | 25 | </Project> |
diff --git a/src/ext/Iis/CSharp.Build.props b/src/ext/Iis/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/Iis/CSharp.Build.props +++ /dev/null | |||
| @@ -1,11 +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 | <SignAssembly>true</SignAssembly> | ||
| 9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | </Project> | ||
diff --git a/src/ext/Iis/Cpp.Build.props b/src/ext/Iis/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/Iis/Cpp.Build.props +++ /dev/null | |||
| @@ -1,86 +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)'=='Release' "> | ||
| 74 | <ClCompile> | ||
| 75 | <Optimization>MinSpace</Optimization> | ||
| 76 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 78 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 79 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 80 | </ClCompile> | ||
| 81 | <Link> | ||
| 82 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 83 | <OptimizeReferences>true</OptimizeReferences> | ||
| 84 | </Link> | ||
| 85 | </ItemDefinitionGroup> | ||
| 86 | </Project> | ||
diff --git a/src/ext/Iis/Directory.Build.props b/src/ext/Iis/Directory.Build.props deleted file mode 100644 index f83cc154..00000000 --- a/src/ext/Iis/Directory.Build.props +++ /dev/null | |||
| @@ -1,29 +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.props | ||
| 5 | then update all of the repos. | ||
| 6 | --> | ||
| 7 | <Project> | ||
| 8 | <PropertyGroup> | ||
| 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 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> | ||
| 24 | |||
| 25 | <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.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> | ||
diff --git a/src/ext/Iis/Directory.Build.targets b/src/ext/Iis/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/Iis/Directory.Build.targets +++ /dev/null | |||
| @@ -1,48 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | </Project> | ||
diff --git a/src/ext/Iis/Iis.wixext.sln b/src/ext/Iis/Iis.wixext.sln index 85323fde..d1ab149e 100644 --- a/src/ext/Iis/Iis.wixext.sln +++ b/src/ext/Iis/Iis.wixext.sln | |||
| @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30204.135 | 4 | VisualStudioVersion = 16.0.30204.135 |
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "src\ca\iisca.vcxproj", "{CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "ca\iisca.vcxproj", "{CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "iis", "src\wixlib\iis.wixproj", "{92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "iis", "wixlib\iis.wixproj", "{92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Iis.wixext", "src\wixext\WixToolset.Iis.wixext.csproj", "{612029FB-B5D4-4D7E-B794-A0E202BFE493}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Iis.wixext", "wixext\WixToolset.Iis.wixext.csproj", "{612029FB-B5D4-4D7E-B794-A0E202BFE493}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Iis", "src\test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj", "{E62712D7-31A1-49E4-B1F4-0084FAD14193}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Iis", "test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj", "{E62712D7-31A1-49E4-B1F4-0084FAD14193}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/Iis/appveyor.cmd b/src/ext/Iis/appveyor.cmd deleted file mode 100644 index af993a8f..00000000 --- a/src/ext/Iis/appveyor.cmd +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | nuget restore || exit /b | ||
| 5 | |||
| 6 | msbuild -p:Configuration=Release -t:Restore || exit /b | ||
| 7 | |||
| 8 | msbuild -p:Configuration=Release src\test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj || exit /b | ||
| 9 | dotnet test -c Release --no-build src\test\WixToolsetTest.Iis || exit /b | ||
| 10 | |||
| 11 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Iis.wixext.csproj || exit /b | ||
| 12 | |||
| 13 | @popd | ||
| 14 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/Iis/appveyor.yml b/src/ext/Iis/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Iis/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/Iis/ca/iisca.vcxproj b/src/ext/Iis/ca/iisca.vcxproj index eb1174be..d99ef4ab 100644 --- a/src/ext/Iis/ca/iisca.vcxproj +++ b/src/ext/Iis/ca/iisca.vcxproj | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props')" /> |
| 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" /> |
| 6 | 6 | ||
| 7 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
| @@ -40,14 +40,14 @@ | |||
| 40 | <ProjectModuleDefinitionFile>iisca.def</ProjectModuleDefinitionFile> | 40 | <ProjectModuleDefinitionFile>iisca.def</ProjectModuleDefinitionFile> |
| 41 | <Description>WiX Toolset Iis CustomAction</Description> | 41 | <Description>WiX Toolset Iis CustomAction</Description> |
| 42 | </PropertyGroup> | 42 | </PropertyGroup> |
| 43 | 43 | ||
| 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 46 | 46 | ||
| 47 | <PropertyGroup> | 47 | <PropertyGroup> |
| 48 | <ProjectAdditionalLinkLibraries>crypt32.lib;msi.lib;Ws2_32.lib</ProjectAdditionalLinkLibraries> | 48 | <ProjectAdditionalLinkLibraries>crypt32.lib;msi.lib;Ws2_32.lib</ProjectAdditionalLinkLibraries> |
| 49 | </PropertyGroup> | 49 | </PropertyGroup> |
| 50 | 50 | ||
| 51 | <ItemGroup> | 51 | <ItemGroup> |
| 52 | <ClCompile Include="dllmain.cpp"> | 52 | <ClCompile Include="dllmain.cpp"> |
| 53 | <PrecompiledHeader>Create</PrecompiledHeader> | 53 | <PrecompiledHeader>Create</PrecompiledHeader> |
| @@ -91,6 +91,9 @@ | |||
| 91 | <ClCompile Include="scawebprop7.cpp" /> | 91 | <ClCompile Include="scawebprop7.cpp" /> |
| 92 | <ClCompile Include="scawebsvcext.cpp" /> | 92 | <ClCompile Include="scawebsvcext.cpp" /> |
| 93 | <ClCompile Include="scawebsvcext7.cpp" /> | 93 | <ClCompile Include="scawebsvcext7.cpp" /> |
| 94 | </ItemGroup> | ||
| 95 | |||
| 96 | <ItemGroup> | ||
| 94 | <ClInclude Include="caSuffix.h" /> | 97 | <ClInclude Include="caSuffix.h" /> |
| 95 | <ClInclude Include="CustomMsiErrors.h" /> | 98 | <ClInclude Include="CustomMsiErrors.h" /> |
| 96 | <ClInclude Include="precomp.h" /> | 99 | <ClInclude Include="precomp.h" /> |
| @@ -131,17 +134,18 @@ | |||
| 131 | <ClInclude Include="scawebprop7.h" /> | 134 | <ClInclude Include="scawebprop7.h" /> |
| 132 | <ClInclude Include="scawebsvcext.h" /> | 135 | <ClInclude Include="scawebsvcext.h" /> |
| 133 | <ClInclude Include="scawebsvcext7.h" /> | 136 | <ClInclude Include="scawebsvcext7.h" /> |
| 134 | <None Include="packages.config" /> | 137 | </ItemGroup> |
| 138 | |||
| 139 | <ItemGroup> | ||
| 135 | <None Include="iisca.def" /> | 140 | <None Include="iisca.def" /> |
| 136 | </ItemGroup> | 141 | </ItemGroup> |
| 137 | 142 | ||
| 143 | <ItemGroup> | ||
| 144 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 145 | <PackageReference Include="WixToolset.WcaUtil" /> | ||
| 146 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | ||
| 147 | <PackageReference Include="GitInfo" /> | ||
| 148 | </ItemGroup> | ||
| 149 | |||
| 138 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 150 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 139 | 151 | </Project> | |
| 140 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 141 | <PropertyGroup> | ||
| 142 | <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> | ||
| 143 | </PropertyGroup> | ||
| 144 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" /> | ||
| 145 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" /> | ||
| 146 | </Target> | ||
| 147 | </Project> \ No newline at end of file | ||
diff --git a/src/ext/Iis/ca/packages.config b/src/ext/Iis/ca/packages.config deleted file mode 100644 index e3dc0e43..00000000 --- a/src/ext/Iis/ca/packages.config +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> | ||
| 4 | <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" /> | ||
| 5 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/Iis/ca/precomp.h b/src/ext/Iis/ca/precomp.h index 85ee0890..106ab884 100644 --- a/src/ext/Iis/ca/precomp.h +++ b/src/ext/Iis/ca/precomp.h | |||
| @@ -17,8 +17,6 @@ | |||
| 17 | #include <ComAdmin.h> | 17 | #include <ComAdmin.h> |
| 18 | #include <ahadmin.h> // IIS 7 config | 18 | #include <ahadmin.h> // IIS 7 config |
| 19 | 19 | ||
| 20 | #define MAXUINT USHRT_MAX | ||
| 21 | |||
| 22 | #include "wcautil.h" | 20 | #include "wcautil.h" |
| 23 | #include "wcawow64.h" | 21 | #include "wcawow64.h" |
| 24 | #include "wcawrapquery.h" | 22 | #include "wcawrapquery.h" |
diff --git a/src/ext/Iis/ca/scacert.cpp b/src/ext/Iis/ca/scacert.cpp index 5eae905a..0bb87f9f 100644 --- a/src/ext/Iis/ca/scacert.cpp +++ b/src/ext/Iis/ca/scacert.cpp | |||
| @@ -552,8 +552,12 @@ static HRESULT ReadCertificateFile( | |||
| 552 | // If we have a PFX blob, get the first certificate out of the PFX and use that instead of the PFX. | 552 | // If we have a PFX blob, get the first certificate out of the PFX and use that instead of the PFX. |
| 553 | if (dwContentType & CERT_QUERY_CONTENT_PFX) | 553 | if (dwContentType & CERT_QUERY_CONTENT_PFX) |
| 554 | { | 554 | { |
| 555 | hr = FileRead(&pbData, &cbData, wzPath); | 555 | SIZE_T size = 0; |
| 556 | |||
| 557 | hr = FileRead(&pbData, &size, wzPath); | ||
| 556 | ExitOnFailure(hr, "Failed to read PFX file: %ls", wzPath); | 558 | ExitOnFailure(hr, "Failed to read PFX file: %ls", wzPath); |
| 559 | |||
| 560 | cbData = (DWORD)size; | ||
| 557 | } | 561 | } |
| 558 | else | 562 | else |
| 559 | { | 563 | { |
diff --git a/src/ext/Iis/iis.cmd b/src/ext/Iis/iis.cmd new file mode 100644 index 00000000..02f9f393 --- /dev/null +++ b/src/ext/Iis/iis.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 Iis.wixext build %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.Iis || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Iis.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/Iis/nuget.config b/src/ext/Iis/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/Iis/nuget.config +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 11 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 12 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 13 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 16 | </packageSources> | ||
| 17 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj index 49ed89bc..dc895894 100644 --- a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj +++ b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -23,19 +24,12 @@ | |||
| 23 | </ItemGroup> | 24 | </ItemGroup> |
| 24 | 25 | ||
| 25 | <ItemGroup> | 26 | <ItemGroup> |
| 26 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 27 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 27 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 28 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 29 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 30 | </ItemGroup> | 28 | </ItemGroup> |
| 31 | 29 | ||
| 32 | <ItemGroup> | 30 | <ItemGroup> |
| 33 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 31 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 34 | </ItemGroup> | 32 | <PackageReference Include="xunit" /> |
| 35 | 33 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 36 | <ItemGroup> | ||
| 37 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 38 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 39 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 40 | </ItemGroup> | 34 | </ItemGroup> |
| 41 | </Project> | 35 | </Project> |
diff --git a/src/ext/Iis/wix.snk b/src/ext/Iis/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/Iis/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj index 81d41e77..a8b94783 100644 --- a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj +++ b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj | |||
| @@ -17,15 +17,11 @@ | |||
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | 20 | <PackageReference Include="WixToolset.Data" PrivateAssets="all" /> |
| 21 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 21 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> |
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | 23 | ||
| 24 | <ItemGroup> | 24 | <ItemGroup> |
| 25 | <ProjectReference Include="..\wixlib\iis.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 25 | <ProjectReference Include="..\wixlib\iis.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> |
| 26 | </ItemGroup> | 26 | </ItemGroup> |
| 27 | |||
| 28 | <ItemGroup> | ||
| 29 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> | ||
| 30 | </ItemGroup> | ||
| 31 | </Project> | 27 | </Project> |
diff --git a/src/ext/Iis/wixlib/iis.wixproj b/src/ext/Iis/wixlib/iis.wixproj index 89f9608f..6ac4aea1 100644 --- a/src/ext/Iis/wixlib/iis.wixproj +++ b/src/ext/Iis/wixlib/iis.wixproj | |||
| @@ -14,13 +14,13 @@ | |||
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | 15 | ||
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=ARM64" /> | 17 | <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> |
| 18 | <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x86" /> | 18 | <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> |
| 19 | <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x64" /> | 19 | <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | 21 | ||
| 22 | <ItemGroup> | 22 | <ItemGroup> |
| 23 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> | 23 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 24 | <PackageReference Include="GitInfo" /> | ||
| 24 | </ItemGroup> | 25 | </ItemGroup> |
| 25 | |||
| 26 | </Project> | 26 | </Project> |
diff --git a/src/ext/Msmq/CSharp.Build.props b/src/ext/Msmq/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/Msmq/CSharp.Build.props +++ /dev/null | |||
| @@ -1,11 +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 | <SignAssembly>true</SignAssembly> | ||
| 9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | </Project> | ||
diff --git a/src/ext/Msmq/Cpp.Build.props b/src/ext/Msmq/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/Msmq/Cpp.Build.props +++ /dev/null | |||
| @@ -1,86 +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)'=='Release' "> | ||
| 74 | <ClCompile> | ||
| 75 | <Optimization>MinSpace</Optimization> | ||
| 76 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 78 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 79 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 80 | </ClCompile> | ||
| 81 | <Link> | ||
| 82 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 83 | <OptimizeReferences>true</OptimizeReferences> | ||
| 84 | </Link> | ||
| 85 | </ItemDefinitionGroup> | ||
| 86 | </Project> | ||
diff --git a/src/ext/Msmq/Directory.Build.props b/src/ext/Msmq/Directory.Build.props deleted file mode 100644 index f83cc154..00000000 --- a/src/ext/Msmq/Directory.Build.props +++ /dev/null | |||
| @@ -1,29 +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.props | ||
| 5 | then update all of the repos. | ||
| 6 | --> | ||
| 7 | <Project> | ||
| 8 | <PropertyGroup> | ||
| 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 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> | ||
| 24 | |||
| 25 | <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.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> | ||
diff --git a/src/ext/Msmq/Directory.Build.targets b/src/ext/Msmq/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/Msmq/Directory.Build.targets +++ /dev/null | |||
| @@ -1,48 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | </Project> | ||
diff --git a/src/ext/Msmq/Msmq.wixext.sln b/src/ext/Msmq/Msmq.wixext.sln index e3ebed6d..d6728547 100644 --- a/src/ext/Msmq/Msmq.wixext.sln +++ b/src/ext/Msmq/Msmq.wixext.sln | |||
| @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio 15 | 3 | # Visual Studio 15 |
| 4 | VisualStudioVersion = 15.0.28010.2016 | 4 | VisualStudioVersion = 15.0.28010.2016 |
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msmqca", "src\ca\msmqca.vcxproj", "{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msmqca", "ca\msmqca.vcxproj", "{CAD56A7E-342B-4324-9DCB-BCEB8F3BC80D}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "msmq", "src\wixlib\msmq.wixproj", "{42493058-5FC8-4F85-9884-FF3190E084B6}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "msmq", "wixlib\msmq.wixproj", "{42493058-5FC8-4F85-9884-FF3190E084B6}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Msmq.wixext", "src\wixext\WixToolset.Msmq.wixext.csproj", "{B990D81B-9F60-4EEE-B31D-B5D1EAA799EE}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Msmq.wixext", "wixext\WixToolset.Msmq.wixext.csproj", "{B990D81B-9F60-4EEE-B31D-B5D1EAA799EE}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Msmq", "src\test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj", "{B63DA068-338F-473B-9097-FC4E64830A2A}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Msmq", "test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj", "{B63DA068-338F-473B-9097-FC4E64830A2A}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/Msmq/appveyor.cmd b/src/ext/Msmq/appveyor.cmd deleted file mode 100644 index f493b577..00000000 --- a/src/ext/Msmq/appveyor.cmd +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | nuget restore || exit /b | ||
| 5 | |||
| 6 | msbuild -p:Configuration=Release -t:Restore || exit /b | ||
| 7 | |||
| 8 | msbuild -p:Configuration=Release src\test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj || exit /b | ||
| 9 | dotnet test -c Release --no-build src\test\WixToolsetTest.Msmq || exit /b | ||
| 10 | |||
| 11 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Msmq.wixext.csproj || exit /b | ||
| 12 | |||
| 13 | @popd | ||
| 14 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/Msmq/appveyor.yml b/src/ext/Msmq/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Msmq/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/Msmq/ca/msmqca.vcxproj b/src/ext/Msmq/ca/msmqca.vcxproj index c4cb3323..473624b4 100644 --- a/src/ext/Msmq/ca/msmqca.vcxproj +++ b/src/ext/Msmq/ca/msmqca.vcxproj | |||
| @@ -2,7 +2,7 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props')" /> |
| 6 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" /> | 6 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" /> |
| 7 | 7 | ||
| 8 | <ItemGroup Label="ProjectConfigurations"> | 8 | <ItemGroup Label="ProjectConfigurations"> |
| @@ -55,17 +55,15 @@ | |||
| 55 | </ItemGroup> | 55 | </ItemGroup> |
| 56 | 56 | ||
| 57 | <ItemGroup> | 57 | <ItemGroup> |
| 58 | <None Include="packages.config" /> | ||
| 59 | <None Include="msmqca.def" /> | 58 | <None Include="msmqca.def" /> |
| 60 | </ItemGroup> | 59 | </ItemGroup> |
| 61 | 60 | ||
| 62 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 61 | <ItemGroup> |
| 62 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 63 | <PackageReference Include="WixToolset.WcaUtil" /> | ||
| 64 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 65 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 66 | </ItemGroup> | ||
| 63 | 67 | ||
| 64 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 68 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 65 | <PropertyGroup> | ||
| 66 | <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> | ||
| 67 | </PropertyGroup> | ||
| 68 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" /> | ||
| 69 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props'))" /> | ||
| 70 | </Target> | ||
| 71 | </Project> | 69 | </Project> |
diff --git a/src/ext/Msmq/ca/packages.config b/src/ext/Msmq/ca/packages.config deleted file mode 100644 index 9d88f529..00000000 --- a/src/ext/Msmq/ca/packages.config +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" /> | ||
| 4 | <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" /> | ||
| 5 | </packages> \ No newline at end of file | ||
diff --git a/src/ext/Msmq/msmq.cmd b/src/ext/Msmq/msmq.cmd new file mode 100644 index 00000000..1a60dad3 --- /dev/null +++ b/src/ext/Msmq/msmq.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 Msmq.wixext build %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.Msmq || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Msmq.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/Msmq/nuget.config b/src/ext/Msmq/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/Msmq/nuget.config +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 11 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 12 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 13 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 16 | </packageSources> | ||
| 17 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj index 7f74e043..726186b6 100644 --- a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj +++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -23,19 +24,12 @@ | |||
| 23 | </ItemGroup> | 24 | </ItemGroup> |
| 24 | 25 | ||
| 25 | <ItemGroup> | 26 | <ItemGroup> |
| 26 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 27 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 27 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 28 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 29 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 30 | </ItemGroup> | 28 | </ItemGroup> |
| 31 | 29 | ||
| 32 | <ItemGroup> | 30 | <ItemGroup> |
| 33 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 31 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 34 | </ItemGroup> | 32 | <PackageReference Include="xunit" /> |
| 35 | 33 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 36 | <ItemGroup> | ||
| 37 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 38 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 39 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 40 | </ItemGroup> | 34 | </ItemGroup> |
| 41 | </Project> | 35 | </Project> |
diff --git a/src/ext/Msmq/wix.snk b/src/ext/Msmq/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/Msmq/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj index 4bd6a3f5..7467aaf2 100644 --- a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj +++ b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj | |||
| @@ -17,14 +17,10 @@ | |||
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 20 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> |
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | 22 | ||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
| 24 | <ProjectReference Include="..\wixlib\msmq.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 24 | <ProjectReference Include="..\wixlib\msmq.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> |
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
| 29 | </ItemGroup> | ||
| 30 | </Project> | 26 | </Project> |
diff --git a/src/ext/Msmq/wixlib/msmq.wixproj b/src/ext/Msmq/wixlib/msmq.wixproj index ccccbf49..15111cb5 100644 --- a/src/ext/Msmq/wixlib/msmq.wixproj +++ b/src/ext/Msmq/wixlib/msmq.wixproj | |||
| @@ -1,6 +1,5 @@ | |||
| 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 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | |||
| 4 | <PropertyGroup> | 3 | <PropertyGroup> |
| 5 | <OutputType>Library</OutputType> | 4 | <OutputType>Library</OutputType> |
| 6 | <BindFiles>true</BindFiles> | 5 | <BindFiles>true</BindFiles> |
| @@ -8,11 +7,11 @@ | |||
| 8 | </PropertyGroup> | 7 | </PropertyGroup> |
| 9 | 8 | ||
| 10 | <ItemGroup> | 9 | <ItemGroup> |
| 11 | <ProjectReference Include="..\ca\msmqca.vcxproj" /> | 10 | <ProjectReference Include="..\ca\msmqca.vcxproj" ReferenceOutputAssembly="false" /> |
| 12 | </ItemGroup> | 11 | </ItemGroup> |
| 13 | 12 | ||
| 14 | <ItemGroup> | 13 | <ItemGroup> |
| 15 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 14 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 15 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | |||
| 18 | </Project> | 17 | </Project> |
diff --git a/src/ext/NetFx/Directory.Build.props b/src/ext/NetFx/Directory.Build.props index b3c6287c..754111fd 100644 --- a/src/ext/NetFx/Directory.Build.props +++ b/src/ext/NetFx/Directory.Build.props | |||
| @@ -1,27 +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>NetFx.wixext</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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | 9 | <Import Project="..\..\Directory.Build.props" /> |
| 26 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 27 | </Project> | 10 | </Project> |
diff --git a/src/ext/NetFx/Directory.Build.targets b/src/ext/NetFx/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/NetFx/Directory.Build.targets +++ /dev/null | |||
| @@ -1,51 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | |||
| 49 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 50 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 51 | </Project> | ||
diff --git a/src/ext/NetFx/Directory.csproj.props b/src/ext/NetFx/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/NetFx/Directory.csproj.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/ext/NetFx/Directory.csproj.targets b/src/ext/NetFx/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/NetFx/Directory.csproj.targets +++ /dev/null | |||
| @@ -1,26 +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\Directory.csproj.targets | ||
| 4 | then update all of the repos. | ||
| 5 | --> | ||
| 6 | <Project> | ||
| 7 | <PropertyGroup> | ||
| 8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 13 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 14 | <PropertyGroup> | ||
| 15 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 16 | |||
| 17 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 18 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath> | ||
| 19 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 20 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 21 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 22 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 23 | </PropertyGroup> | ||
| 24 | </Target> | ||
| 25 | |||
| 26 | </Project> | ||
diff --git a/src/ext/NetFx/Directory.vcxproj.props b/src/ext/NetFx/Directory.vcxproj.props deleted file mode 100644 index 47c2c143..00000000 --- a/src/ext/NetFx/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,115 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <PropertyGroup> | ||
| 23 | <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> | ||
| 24 | </PropertyGroup> | ||
| 25 | |||
| 26 | <ItemDefinitionGroup> | ||
| 27 | <ClCompile> | ||
| 28 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 29 | <WarningLevel>Level4</WarningLevel> | ||
| 30 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 31 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 32 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 33 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 34 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 35 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 36 | <ExceptionHandling>false</ExceptionHandling> | ||
| 37 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 38 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 39 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 40 | </ClCompile> | ||
| 41 | <ResourceCompile> | ||
| 42 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 43 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 44 | </ResourceCompile> | ||
| 45 | <Lib> | ||
| 46 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 47 | </Lib> | ||
| 48 | <Link> | ||
| 49 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 50 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 51 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 52 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 53 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 54 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 55 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 56 | </Link> | ||
| 57 | </ItemDefinitionGroup> | ||
| 58 | |||
| 59 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 60 | <ClCompile> | ||
| 61 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 62 | </ClCompile> | ||
| 63 | </ItemDefinitionGroup> | ||
| 64 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 65 | <ClCompile> | ||
| 66 | <CallingConvention>CDecl</CallingConvention> | ||
| 67 | </ClCompile> | ||
| 68 | </ItemDefinitionGroup> | ||
| 69 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 70 | <ClCompile> | ||
| 71 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 72 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 73 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 74 | </ClCompile> | ||
| 75 | </ItemDefinitionGroup> | ||
| 76 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 77 | <ClCompile> | ||
| 78 | <Optimization>Disabled</Optimization> | ||
| 79 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 80 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 81 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 82 | </ClCompile> | ||
| 83 | </ItemDefinitionGroup> | ||
| 84 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | ||
| 85 | <ClCompile> | ||
| 86 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 87 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | ||
| 88 | </ClCompile> | ||
| 89 | </ItemDefinitionGroup> | ||
| 90 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 91 | <ClCompile> | ||
| 92 | <Optimization>MinSpace</Optimization> | ||
| 93 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 94 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 95 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 96 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 97 | </ClCompile> | ||
| 98 | <Link> | ||
| 99 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 100 | <OptimizeReferences>true</OptimizeReferences> | ||
| 101 | </Link> | ||
| 102 | </ItemDefinitionGroup> | ||
| 103 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | ||
| 104 | <ClCompile> | ||
| 105 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 106 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | ||
| 107 | </ClCompile> | ||
| 108 | </ItemDefinitionGroup> | ||
| 109 | <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' "> | ||
| 110 | <Link> | ||
| 111 | <KeyFile>$(LinkKeyFile)</KeyFile> | ||
| 112 | <DelaySign>$(LinkDelaySign)</DelaySign> | ||
| 113 | </Link> | ||
| 114 | </ItemDefinitionGroup> | ||
| 115 | </Project> | ||
diff --git a/src/ext/NetFx/NetFx.wixext.sln b/src/ext/NetFx/NetFx.wixext.sln index e830aeea..8316ac91 100644 --- a/src/ext/NetFx/NetFx.wixext.sln +++ b/src/ext/NetFx/NetFx.wixext.sln | |||
| @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio 15 | 3 | # Visual Studio 15 |
| 4 | VisualStudioVersion = 15.0.27130.2010 | 4 | VisualStudioVersion = 15.0.27130.2010 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netfxca", "src\ca\netfxca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netfxca", "ca\netfxca.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "netfx", "src\wixlib\netfx.wixproj", "{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "netfx", "wixlib\netfx.wixproj", "{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Netfx.wixext", "src\wixext\WixToolset.Netfx.wixext.csproj", "{F774E291-0563-4DDD-B873-F5C31683CF4B}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Netfx.wixext", "wixext\WixToolset.Netfx.wixext.csproj", "{F774E291-0563-4DDD-B873-F5C31683CF4B}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Netfx", "src\test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj", "{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Netfx", "test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj", "{AABEF178-D4A2-4EE1-8E00-3EBAB23A5548}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/NetFx/appveyor.cmd b/src/ext/NetFx/appveyor.cmd deleted file mode 100644 index d7e705f0..00000000 --- a/src/ext/NetFx/appveyor.cmd +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | :: Restore | ||
| 7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
| 8 | |||
| 9 | :: Build | ||
| 10 | msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj || exit /b | ||
| 11 | |||
| 12 | :: Test | ||
| 13 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Netfx || exit /b | ||
| 14 | |||
| 15 | :: Pack | ||
| 16 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Netfx.wixext.csproj || exit /b | ||
| 17 | |||
| 18 | @popd | ||
| 19 | @endlocal | ||
diff --git a/src/ext/NetFx/appveyor.yml b/src/ext/NetFx/appveyor.yml deleted file mode 100644 index c53cc9cc..00000000 --- a/src/ext/NetFx/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\**\*.snupkg | ||
| 37 | name: snupkg | ||
| 38 | |||
| 39 | notifications: | ||
| 40 | - provider: Slack | ||
| 41 | incoming_webhook: | ||
| 42 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/NetFx/ca/netfxca.vcxproj b/src/ext/NetFx/ca/netfxca.vcxproj index 5e25b683..34332180 100644 --- a/src/ext/NetFx/ca/netfxca.vcxproj +++ b/src/ext/NetFx/ca/netfxca.vcxproj | |||
| @@ -63,10 +63,10 @@ | |||
| 63 | </ItemGroup> | 63 | </ItemGroup> |
| 64 | 64 | ||
| 65 | <ItemGroup> | 65 | <ItemGroup> |
| 66 | <PackageReference Include="WixToolset.Dutil" Version="4.0.72" /> | 66 | <PackageReference Include="WixToolset.Dutil" /> |
| 67 | <PackageReference Include="WixToolset.WcaUtil" Version="4.0.19" /> | 67 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 68 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 68 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 69 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 69 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
| 70 | </ItemGroup> | 70 | </ItemGroup> |
| 71 | 71 | ||
| 72 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 72 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
diff --git a/src/ext/NetFx/netfx.cmd b/src/ext/NetFx/netfx.cmd new file mode 100644 index 00000000..d5e0989b --- /dev/null +++ b/src/ext/NetFx/netfx.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 ext\NetFx %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.Netfx || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Netfx.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/NetFx/nuget.config b/src/ext/NetFx/nuget.config deleted file mode 100644 index 7f258709..00000000 --- a/src/ext/NetFx/nuget.config +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 6 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 7 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 8 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 9 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 10 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 11 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 12 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 13 | <add key="wixtoolset-bal-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-bal-wixext" /> | ||
| 14 | <add key="wixtoolset-util-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-util-wixext" /> | ||
| 15 | <add key="wixburn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 16 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 17 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 18 | </packageSources> | ||
| 19 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj index 1c41d176..24f807eb 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <DebugType>embedded</DebugType> | 7 | <DebugType>embedded</DebugType> |
| 8 | <IsPackable>false</IsPackable> | 8 | <IsPackable>false</IsPackable> |
| 9 | <SignOutput>false</SignOutput> | ||
| 9 | </PropertyGroup> | 10 | </PropertyGroup> |
| 10 | 11 | ||
| 11 | <ItemGroup> | 12 | <ItemGroup> |
| @@ -17,21 +18,14 @@ | |||
| 17 | </ItemGroup> | 18 | </ItemGroup> |
| 18 | 19 | ||
| 19 | <ItemGroup> | 20 | <ItemGroup> |
| 20 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.*" /> | 21 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 21 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 22 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 22 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 23 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 24 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 25 | </ItemGroup> | 23 | </ItemGroup> |
| 26 | 24 | ||
| 27 | <ItemGroup> | 25 | <ItemGroup> |
| 28 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 26 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 29 | </ItemGroup> | 27 | <PackageReference Include="xunit" /> |
| 30 | 28 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 31 | <ItemGroup> | ||
| 32 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 33 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 34 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 35 | </ItemGroup> | 29 | </ItemGroup> |
| 36 | 30 | ||
| 37 | <Target Name="CopyExtensions" AfterTargets="Build"> | 31 | <Target Name="CopyExtensions" AfterTargets="Build"> |
diff --git a/src/ext/NetFx/wix.snk b/src/ext/NetFx/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/NetFx/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj index 7c1d55c1..0e89f172 100644 --- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj +++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj | |||
| @@ -20,12 +20,7 @@ | |||
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | 21 | ||
| 22 | <ItemGroup> | 22 | <ItemGroup> |
| 23 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | 23 | <PackageReference Include="WixToolset.Data" /> |
| 24 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 24 | <PackageReference Include="WixToolset.Extensibility" /> |
| 25 | </ItemGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> | ||
| 29 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
| 30 | </ItemGroup> | 25 | </ItemGroup> |
| 31 | </Project> | 26 | </Project> |
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec index ba3eaade..da07f591 100644 --- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec +++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | </metadata> | 14 | </metadata> |
| 15 | 15 | ||
| 16 | <files> | 16 | <files> |
| 17 | <file src="$projectFolder$$id$.targets" target="build" /> | 17 | <file src="$projectFolder$\$id$.targets" target="build" /> |
| 18 | 18 | ||
| 19 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 19 | <file src="$id$.dll" target="tools" /> |
| 20 | 20 | ||
| 21 | <file src="ARM64\*.pdb" target="pdbs\ARM64" /> | 21 | <file src="..\ARM64\*.pdb" target="pdbs\ARM64" /> |
| 22 | <file src="x86\*.pdb" target="pdbs\x86" /> | 22 | <file src="..\x86\*.pdb" target="pdbs\x86" /> |
| 23 | <file src="x64\*.pdb" target="pdbs\x64" /> | 23 | <file src="..\x64\*.pdb" target="pdbs\x64" /> |
| 24 | </files> | 24 | </files> |
| 25 | </package> | 25 | </package> |
diff --git a/src/ext/NetFx/wixlib/netfx.wixproj b/src/ext/NetFx/wixlib/netfx.wixproj index 937ed0d4..ad7d028c 100644 --- a/src/ext/NetFx/wixlib/netfx.wixproj +++ b/src/ext/NetFx/wixlib/netfx.wixproj | |||
| @@ -2,7 +2,6 @@ | |||
| 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 | <Project Sdk="WixToolset.Sdk"> | 4 | <Project Sdk="WixToolset.Sdk"> |
| 5 | |||
| 6 | <PropertyGroup> | 5 | <PropertyGroup> |
| 7 | <OutputType>Library</OutputType> | 6 | <OutputType>Library</OutputType> |
| 8 | <BindFiles>true</BindFiles> | 7 | <BindFiles>true</BindFiles> |
| @@ -21,12 +20,12 @@ | |||
| 21 | </ItemGroup> | 20 | </ItemGroup> |
| 22 | 21 | ||
| 23 | <ItemGroup> | 22 | <ItemGroup> |
| 24 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.*" /> | 23 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 25 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 26 | </ItemGroup> | 25 | </ItemGroup> |
| 27 | 26 | ||
| 28 | <ItemGroup> | 27 | <ItemGroup> |
| 29 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 28 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 29 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 30 | </ItemGroup> | 30 | </ItemGroup> |
| 31 | |||
| 32 | </Project> | 31 | </Project> |
diff --git a/src/ext/PowerShell/CSharp.Build.props b/src/ext/PowerShell/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/PowerShell/CSharp.Build.props +++ /dev/null | |||
| @@ -1,11 +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 | <SignAssembly>true</SignAssembly> | ||
| 9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | </Project> | ||
diff --git a/src/ext/PowerShell/Directory.Build.props b/src/ext/PowerShell/Directory.Build.props index f83cc154..af932016 100644 --- a/src/ext/PowerShell/Directory.Build.props +++ b/src/ext/PowerShell/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>PowerShell.wixext</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/ext/PowerShell/Directory.Build.targets b/src/ext/PowerShell/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/ext/PowerShell/Directory.Build.targets +++ /dev/null | |||
| @@ -1,48 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | </Project> | ||
diff --git a/src/ext/PowerShell/FindLocalWix.props b/src/ext/PowerShell/FindLocalWix.props deleted file mode 100644 index 1666e4fe..00000000 --- a/src/ext/PowerShell/FindLocalWix.props +++ /dev/null | |||
| @@ -1,8 +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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 5 | <PropertyGroup> | ||
| 6 | <WixTargetsPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Tools\README.md') And Exists('$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets') ">$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets</WixTargetsPath> | ||
| 7 | </PropertyGroup> | ||
| 8 | </Project> | ||
diff --git a/src/ext/PowerShell/PowerShell.wixext.sln b/src/ext/PowerShell/PowerShell.wixext.sln index a036d47e..e1e6a7d8 100644 --- a/src/ext/PowerShell/PowerShell.wixext.sln +++ b/src/ext/PowerShell/PowerShell.wixext.sln | |||
| @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30611.23 | 4 | VisualStudioVersion = 16.0.30611.23 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "powershell", "src\wixlib\powershell.wixproj", "{9D4CCDFC-840C-4D4E-A9B0-3D6015480645}" | 6 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "powershell", "wixlib\powershell.wixproj", "{9D4CCDFC-840C-4D4E-A9B0-3D6015480645}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.PowerShell.wixext", "src\wixext\WixToolset.PowerShell.wixext.csproj", "{6F1482DF-1598-4D88-BDAA-B9D0E0242139}" | 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.PowerShell.wixext", "wixext\WixToolset.PowerShell.wixext.csproj", "{6F1482DF-1598-4D88-BDAA-B9D0E0242139}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.PowerShell", "src\test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj", "{BFD10109-F4F3-4530-BE3B-802342D411F7}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.PowerShell", "test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj", "{BFD10109-F4F3-4530-BE3B-802342D411F7}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Global | 12 | Global |
| 13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/PowerShell/appveyor.cmd b/src/ext/PowerShell/appveyor.cmd deleted file mode 100644 index 27d33a5d..00000000 --- a/src/ext/PowerShell/appveyor.cmd +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | nuget restore | ||
| 5 | |||
| 6 | msbuild -p:Configuration=Release -t:Restore | ||
| 7 | |||
| 8 | msbuild -p:Configuration=Release src\test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj | ||
| 9 | |||
| 10 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.PowerShell.wixext.csproj | ||
| 11 | |||
| 12 | @popd | ||
| 13 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/PowerShell/appveyor.yml b/src/ext/PowerShell/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/PowerShell/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/PowerShell/nuget.config b/src/ext/PowerShell/nuget.config deleted file mode 100644 index f4f0704e..00000000 --- a/src/ext/PowerShell/nuget.config +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 6 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 7 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 8 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 9 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 10 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 11 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 12 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 13 | </packageSources> | ||
| 14 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/PowerShell/ps.cmd b/src/ext/PowerShell/ps.cmd new file mode 100644 index 00000000..66eed1db --- /dev/null +++ b/src/ext/PowerShell/ps.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 PowerShell.wixext build %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.PowerShell.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj index 69645fb7..4a33631a 100644 --- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj +++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -12,10 +13,7 @@ | |||
| 12 | </PropertyGroup> | 13 | </PropertyGroup> |
| 13 | 14 | ||
| 14 | <ItemGroup> | 15 | <ItemGroup> |
| 15 | <Content Include="TestData\TypesFile\example.txt" CopyToOutputDirectory="PreserveNewest" /> | 16 | <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" /> |
| 16 | <Content Include="TestData\TypesFile\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | ||
| 17 | <Content Include="TestData\TypesFile\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 18 | <Content Include="TestData\TypesFile\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 19 | </ItemGroup> | 17 | </ItemGroup> |
| 20 | 18 | ||
| 21 | <ItemGroup> | 19 | <ItemGroup> |
| @@ -23,19 +21,12 @@ | |||
| 23 | </ItemGroup> | 21 | </ItemGroup> |
| 24 | 22 | ||
| 25 | <ItemGroup> | 23 | <ItemGroup> |
| 26 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 27 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 28 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 29 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 30 | </ItemGroup> | 25 | </ItemGroup> |
| 31 | 26 | ||
| 32 | <ItemGroup> | 27 | <ItemGroup> |
| 33 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 28 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 34 | </ItemGroup> | 29 | <PackageReference Include="xunit" /> |
| 35 | 30 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 36 | <ItemGroup> | ||
| 37 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 38 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 39 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 40 | </ItemGroup> | 31 | </ItemGroup> |
| 41 | </Project> | 32 | </Project> |
diff --git a/src/ext/PowerShell/wix.snk b/src/ext/PowerShell/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/PowerShell/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj index a89a574c..4d5403d7 100644 --- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj +++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj | |||
| @@ -17,14 +17,10 @@ | |||
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 20 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> |
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | 22 | ||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
| 24 | <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 24 | <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> |
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
| 29 | </ItemGroup> | ||
| 30 | </Project> | 26 | </Project> |
diff --git a/src/ext/PowerShell/wixlib/powershell.wixproj b/src/ext/PowerShell/wixlib/powershell.wixproj index 6d6b413b..f35c819a 100644 --- a/src/ext/PowerShell/wixlib/powershell.wixproj +++ b/src/ext/PowerShell/wixlib/powershell.wixproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | </PropertyGroup> | 6 | </PropertyGroup> |
| 7 | 7 | ||
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 9 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 10 | <PackageReference Include="GitInfo" /> | ||
| 10 | </ItemGroup> | 11 | </ItemGroup> |
| 11 | </Project> | 12 | </Project> |
diff --git a/src/ext/Sql/Directory.Build.props b/src/ext/Sql/Directory.Build.props index b3c6287c..5ef36871 100644 --- a/src/ext/Sql/Directory.Build.props +++ b/src/ext/Sql/Directory.Build.props | |||
| @@ -1,27 +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>Sql.wixext</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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | 9 | <Import Project="..\..\Directory.Build.props" /> |
| 26 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 27 | </Project> | 10 | </Project> |
diff --git a/src/ext/Sql/Directory.Build.targets b/src/ext/Sql/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/Sql/Directory.Build.targets +++ /dev/null | |||
| @@ -1,51 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | |||
| 49 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 50 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 51 | </Project> | ||
diff --git a/src/ext/Sql/Directory.csproj.props b/src/ext/Sql/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/Sql/Directory.csproj.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/ext/Sql/Directory.csproj.targets b/src/ext/Sql/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/Sql/Directory.csproj.targets +++ /dev/null | |||
| @@ -1,26 +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\Directory.csproj.targets | ||
| 4 | then update all of the repos. | ||
| 5 | --> | ||
| 6 | <Project> | ||
| 7 | <PropertyGroup> | ||
| 8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 13 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 14 | <PropertyGroup> | ||
| 15 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 16 | |||
| 17 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 18 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath> | ||
| 19 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 20 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 21 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 22 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 23 | </PropertyGroup> | ||
| 24 | </Target> | ||
| 25 | |||
| 26 | </Project> | ||
diff --git a/src/ext/Sql/Directory.vcxproj.props b/src/ext/Sql/Directory.vcxproj.props deleted file mode 100644 index bcf26c57..00000000 --- a/src/ext/Sql/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,111 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <ItemDefinitionGroup> | ||
| 23 | <ClCompile> | ||
| 24 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 25 | <WarningLevel>Level4</WarningLevel> | ||
| 26 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 27 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 28 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 29 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 30 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 31 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 32 | <ExceptionHandling>false</ExceptionHandling> | ||
| 33 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 34 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 35 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 36 | </ClCompile> | ||
| 37 | <ResourceCompile> | ||
| 38 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 39 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 40 | </ResourceCompile> | ||
| 41 | <Lib> | ||
| 42 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 43 | </Lib> | ||
| 44 | <Link> | ||
| 45 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 46 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 47 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 48 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 49 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 50 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 51 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 52 | </Link> | ||
| 53 | </ItemDefinitionGroup> | ||
| 54 | |||
| 55 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 56 | <ClCompile> | ||
| 57 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 58 | </ClCompile> | ||
| 59 | </ItemDefinitionGroup> | ||
| 60 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 61 | <ClCompile> | ||
| 62 | <CallingConvention>CDecl</CallingConvention> | ||
| 63 | </ClCompile> | ||
| 64 | </ItemDefinitionGroup> | ||
| 65 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 66 | <ClCompile> | ||
| 67 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 68 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 69 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 70 | </ClCompile> | ||
| 71 | </ItemDefinitionGroup> | ||
| 72 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 73 | <ClCompile> | ||
| 74 | <Optimization>Disabled</Optimization> | ||
| 75 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 76 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 78 | </ClCompile> | ||
| 79 | </ItemDefinitionGroup> | ||
| 80 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | ||
| 81 | <ClCompile> | ||
| 82 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 83 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | ||
| 84 | </ClCompile> | ||
| 85 | </ItemDefinitionGroup> | ||
| 86 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 87 | <ClCompile> | ||
| 88 | <Optimization>MinSpace</Optimization> | ||
| 89 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 90 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 91 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 92 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 93 | </ClCompile> | ||
| 94 | <Link> | ||
| 95 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 96 | <OptimizeReferences>true</OptimizeReferences> | ||
| 97 | </Link> | ||
| 98 | </ItemDefinitionGroup> | ||
| 99 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | ||
| 100 | <ClCompile> | ||
| 101 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 102 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | ||
| 103 | </ClCompile> | ||
| 104 | </ItemDefinitionGroup> | ||
| 105 | <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' "> | ||
| 106 | <Link> | ||
| 107 | <KeyFile>$(LinkKeyFile)</KeyFile> | ||
| 108 | <DelaySign>$(LinkDelaySign)</DelaySign> | ||
| 109 | </Link> | ||
| 110 | </ItemDefinitionGroup> | ||
| 111 | </Project> | ||
diff --git a/src/ext/Sql/Sql.wixext.sln b/src/ext/Sql/Sql.wixext.sln index cfa9ad4f..bb280d36 100644 --- a/src/ext/Sql/Sql.wixext.sln +++ b/src/ext/Sql/Sql.wixext.sln | |||
| @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30204.135 | 4 | VisualStudioVersion = 16.0.30204.135 |
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlca", "src\ca\sqlca.vcxproj", "{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlca", "ca\sqlca.vcxproj", "{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "sql", "src\wixlib\sql.wixproj", "{9ACF1A20-D801-45CC-A463-F9D13E506AA3}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "sql", "wixlib\sql.wixproj", "{9ACF1A20-D801-45CC-A463-F9D13E506AA3}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Sql.wixext", "src\wixext\WixToolset.Sql.wixext.csproj", "{0E05519A-0045-4AEC-BD0C-D9205FF1468F}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Sql.wixext", "wixext\WixToolset.Sql.wixext.csproj", "{0E05519A-0045-4AEC-BD0C-D9205FF1468F}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Sql", "src\test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj", "{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Sql", "test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj", "{FE72A369-03CA-4EBC-BC7B-A8BBF5BBD3E0}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/Sql/appveyor.cmd b/src/ext/Sql/appveyor.cmd deleted file mode 100644 index f21449d2..00000000 --- a/src/ext/Sql/appveyor.cmd +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | :: Restore | ||
| 7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
| 8 | |||
| 9 | :: Build | ||
| 10 | msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj || exit /b | ||
| 11 | |||
| 12 | :: Test | ||
| 13 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Sql || exit /b | ||
| 14 | |||
| 15 | :: Pack | ||
| 16 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Sql.wixext.csproj || exit /b | ||
| 17 | |||
| 18 | @popd | ||
| 19 | @endlocal | ||
diff --git a/src/ext/Sql/appveyor.yml b/src/ext/Sql/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Sql/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/Sql/ca/precomp.h b/src/ext/Sql/ca/precomp.h index 266d543c..e92abdc5 100644 --- a/src/ext/Sql/ca/precomp.h +++ b/src/ext/Sql/ca/precomp.h | |||
| @@ -11,8 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #include <strsafe.h> | 12 | #include <strsafe.h> |
| 13 | 13 | ||
| 14 | #define MAXUINT USHRT_MAX | ||
| 15 | |||
| 16 | #include "wcautil.h" | 14 | #include "wcautil.h" |
| 17 | #include "fileutil.h" | 15 | #include "fileutil.h" |
| 18 | #include "memutil.h" | 16 | #include "memutil.h" |
diff --git a/src/ext/Sql/ca/sqlca.vcxproj b/src/ext/Sql/ca/sqlca.vcxproj index 18becc5f..01eae1fb 100644 --- a/src/ext/Sql/ca/sqlca.vcxproj +++ b/src/ext/Sql/ca/sqlca.vcxproj | |||
| @@ -73,10 +73,10 @@ | |||
| 73 | </ItemGroup> | 73 | </ItemGroup> |
| 74 | 74 | ||
| 75 | <ItemGroup> | 75 | <ItemGroup> |
| 76 | <PackageReference Include="WixToolset.Dutil" Version="4.0.65" /> | 76 | <PackageReference Include="WixToolset.Dutil" /> |
| 77 | <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" /> | 77 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 78 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 78 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 79 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 79 | <PackageReference Include="GitInfo" /> |
| 80 | </ItemGroup> | 80 | </ItemGroup> |
| 81 | 81 | ||
| 82 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 82 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
diff --git a/src/ext/Sql/nuget.config b/src/ext/Sql/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/Sql/nuget.config +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 11 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 12 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 13 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 16 | </packageSources> | ||
| 17 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/Sql/sql.cmd b/src/ext/Sql/sql.cmd new file mode 100644 index 00000000..0e66816d --- /dev/null +++ b/src/ext/Sql/sql.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 Sql.wixext build %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.Sql || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Sql.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj index bbf3041d..6044a81d 100644 --- a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj +++ b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -20,19 +21,12 @@ | |||
| 20 | </ItemGroup> | 21 | </ItemGroup> |
| 21 | 22 | ||
| 22 | <ItemGroup> | 23 | <ItemGroup> |
| 23 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 24 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 25 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 26 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 27 | </ItemGroup> | 25 | </ItemGroup> |
| 28 | 26 | ||
| 29 | <ItemGroup> | 27 | <ItemGroup> |
| 30 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 28 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 31 | </ItemGroup> | 29 | <PackageReference Include="xunit" /> |
| 32 | 30 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 33 | <ItemGroup> | ||
| 34 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 35 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 36 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 37 | </ItemGroup> | 31 | </ItemGroup> |
| 38 | </Project> | 32 | </Project> |
diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj b/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj index 5a1ebeb0..15cc2820 100644 --- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj +++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj | |||
| @@ -20,11 +20,6 @@ | |||
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | 21 | ||
| 22 | <ItemGroup> | 22 | <ItemGroup> |
| 23 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="All" /> | 23 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" /> |
| 24 | </ItemGroup> | ||
| 25 | |||
| 26 | <ItemGroup> | ||
| 27 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 28 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 29 | </ItemGroup> | 24 | </ItemGroup> |
| 30 | </Project> | 25 | </Project> |
diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec b/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec index ba3eaade..da07f591 100644 --- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec +++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | </metadata> | 14 | </metadata> |
| 15 | 15 | ||
| 16 | <files> | 16 | <files> |
| 17 | <file src="$projectFolder$$id$.targets" target="build" /> | 17 | <file src="$projectFolder$\$id$.targets" target="build" /> |
| 18 | 18 | ||
| 19 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 19 | <file src="$id$.dll" target="tools" /> |
| 20 | 20 | ||
| 21 | <file src="ARM64\*.pdb" target="pdbs\ARM64" /> | 21 | <file src="..\ARM64\*.pdb" target="pdbs\ARM64" /> |
| 22 | <file src="x86\*.pdb" target="pdbs\x86" /> | 22 | <file src="..\x86\*.pdb" target="pdbs\x86" /> |
| 23 | <file src="x64\*.pdb" target="pdbs\x64" /> | 23 | <file src="..\x64\*.pdb" target="pdbs\x64" /> |
| 24 | </files> | 24 | </files> |
| 25 | </package> | 25 | </package> |
diff --git a/src/ext/Sql/wixlib/sql.wixproj b/src/ext/Sql/wixlib/sql.wixproj index ac994e6b..8d92f5ad 100644 --- a/src/ext/Sql/wixlib/sql.wixproj +++ b/src/ext/Sql/wixlib/sql.wixproj | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | 20 | ||
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 22 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 23 | <PackageReference Include="GitInfo" /> | ||
| 23 | </ItemGroup> | 24 | </ItemGroup> |
| 24 | </Project> | 25 | </Project> |
diff --git a/src/ext/UI/Directory.Build.props b/src/ext/UI/Directory.Build.props index b3c6287c..ee3d2302 100644 --- a/src/ext/UI/Directory.Build.props +++ b/src/ext/UI/Directory.Build.props | |||
| @@ -1,27 +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>UI.wixext</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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | 9 | <Import Project="..\..\Directory.Build.props" /> |
| 26 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 27 | </Project> | 10 | </Project> |
diff --git a/src/ext/UI/Directory.Build.targets b/src/ext/UI/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/UI/Directory.Build.targets +++ /dev/null | |||
| @@ -1,51 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | |||
| 49 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 50 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 51 | </Project> | ||
diff --git a/src/ext/UI/Directory.csproj.props b/src/ext/UI/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/UI/Directory.csproj.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/ext/UI/Directory.csproj.targets b/src/ext/UI/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/UI/Directory.csproj.targets +++ /dev/null | |||
| @@ -1,26 +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\Directory.csproj.targets | ||
| 4 | then update all of the repos. | ||
| 5 | --> | ||
| 6 | <Project> | ||
| 7 | <PropertyGroup> | ||
| 8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 13 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 14 | <PropertyGroup> | ||
| 15 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 16 | |||
| 17 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 18 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath> | ||
| 19 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 20 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 21 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 22 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 23 | </PropertyGroup> | ||
| 24 | </Target> | ||
| 25 | |||
| 26 | </Project> | ||
diff --git a/src/ext/UI/Directory.vcxproj.props b/src/ext/UI/Directory.vcxproj.props deleted file mode 100644 index bcf26c57..00000000 --- a/src/ext/UI/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,111 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <ItemDefinitionGroup> | ||
| 23 | <ClCompile> | ||
| 24 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 25 | <WarningLevel>Level4</WarningLevel> | ||
| 26 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 27 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 28 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 29 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 30 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 31 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 32 | <ExceptionHandling>false</ExceptionHandling> | ||
| 33 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 34 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 35 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 36 | </ClCompile> | ||
| 37 | <ResourceCompile> | ||
| 38 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 39 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 40 | </ResourceCompile> | ||
| 41 | <Lib> | ||
| 42 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 43 | </Lib> | ||
| 44 | <Link> | ||
| 45 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 46 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 47 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 48 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 49 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 50 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 51 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 52 | </Link> | ||
| 53 | </ItemDefinitionGroup> | ||
| 54 | |||
| 55 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 56 | <ClCompile> | ||
| 57 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 58 | </ClCompile> | ||
| 59 | </ItemDefinitionGroup> | ||
| 60 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 61 | <ClCompile> | ||
| 62 | <CallingConvention>CDecl</CallingConvention> | ||
| 63 | </ClCompile> | ||
| 64 | </ItemDefinitionGroup> | ||
| 65 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 66 | <ClCompile> | ||
| 67 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 68 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 69 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 70 | </ClCompile> | ||
| 71 | </ItemDefinitionGroup> | ||
| 72 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 73 | <ClCompile> | ||
| 74 | <Optimization>Disabled</Optimization> | ||
| 75 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 76 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 78 | </ClCompile> | ||
| 79 | </ItemDefinitionGroup> | ||
| 80 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | ||
| 81 | <ClCompile> | ||
| 82 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 83 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | ||
| 84 | </ClCompile> | ||
| 85 | </ItemDefinitionGroup> | ||
| 86 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 87 | <ClCompile> | ||
| 88 | <Optimization>MinSpace</Optimization> | ||
| 89 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 90 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 91 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 92 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 93 | </ClCompile> | ||
| 94 | <Link> | ||
| 95 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 96 | <OptimizeReferences>true</OptimizeReferences> | ||
| 97 | </Link> | ||
| 98 | </ItemDefinitionGroup> | ||
| 99 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | ||
| 100 | <ClCompile> | ||
| 101 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 102 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | ||
| 103 | </ClCompile> | ||
| 104 | </ItemDefinitionGroup> | ||
| 105 | <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' "> | ||
| 106 | <Link> | ||
| 107 | <KeyFile>$(LinkKeyFile)</KeyFile> | ||
| 108 | <DelaySign>$(LinkDelaySign)</DelaySign> | ||
| 109 | </Link> | ||
| 110 | </ItemDefinitionGroup> | ||
| 111 | </Project> | ||
diff --git a/src/ext/UI/UI.wixext.sln b/src/ext/UI/UI.wixext.sln index bab6232e..c71826dc 100644 --- a/src/ext/UI/UI.wixext.sln +++ b/src/ext/UI/UI.wixext.sln | |||
| @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30320.27 | 4 | VisualStudioVersion = 16.0.30320.27 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uica", "src\ca\uica.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uica", "ca\uica.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ui", "src\wixlib\ui.wixproj", "{2D4FF07B-26F8-4BEF-B41C-E4383F86DC32}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ui", "wixlib\ui.wixproj", "{2D4FF07B-26F8-4BEF-B41C-E4383F86DC32}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.UI.wixext", "src\wixext\WixToolset.UI.wixext.csproj", "{33F6ABF5-FA13-4B73-99FA-F9BBA894DD9A}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.UI.wixext", "wixext\WixToolset.UI.wixext.csproj", "{33F6ABF5-FA13-4B73-99FA-F9BBA894DD9A}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.UI", "src\test\WixToolsetTest.UI\WixToolsetTest.UI.csproj", "{A37CC793-F659-4C77-A01C-D183023B6880}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.UI", "test\WixToolsetTest.UI\WixToolsetTest.UI.csproj", "{A37CC793-F659-4C77-A01C-D183023B6880}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/UI/appveyor.cmd b/src/ext/UI/appveyor.cmd deleted file mode 100644 index 2c727278..00000000 --- a/src/ext/UI/appveyor.cmd +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | nuget restore || exit /b | ||
| 5 | |||
| 6 | msbuild -p:Configuration=Release -t:Restore || exit /b | ||
| 7 | |||
| 8 | msbuild -p:Configuration=Release src\test\WixToolsetTest.UI\WixToolsetTest.UI.csproj || exit /b | ||
| 9 | dotnet test -c Release --no-build src\test\WixToolsetTest.UI || exit /b | ||
| 10 | |||
| 11 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.UI.wixext.csproj || exit /b | ||
| 12 | |||
| 13 | @popd | ||
| 14 | @endlocal \ No newline at end of file | ||
diff --git a/src/ext/UI/appveyor.yml b/src/ext/UI/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/UI/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/UI/ca/uica.vcxproj b/src/ext/UI/ca/uica.vcxproj index 5ded1266..1b145192 100644 --- a/src/ext/UI/ca/uica.vcxproj +++ b/src/ext/UI/ca/uica.vcxproj | |||
| @@ -48,10 +48,10 @@ | |||
| 48 | </ItemGroup> | 48 | </ItemGroup> |
| 49 | 49 | ||
| 50 | <ItemGroup> | 50 | <ItemGroup> |
| 51 | <PackageReference Include="WixToolset.Dutil" Version="4.0.72" /> | 51 | <PackageReference Include="WixToolset.Dutil" /> |
| 52 | <PackageReference Include="WixToolset.WcaUtil" Version="4.0.19" /> | 52 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 53 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 53 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 54 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 54 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
| 55 | </ItemGroup> | 55 | </ItemGroup> |
| 56 | 56 | ||
| 57 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 57 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
diff --git a/src/ext/UI/nuget.config b/src/ext/UI/nuget.config deleted file mode 100644 index db7aba29..00000000 --- a/src/ext/UI/nuget.config +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 7 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 8 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 9 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 11 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 12 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 13 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 16 | </packageSources> | ||
| 17 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj index a61676dd..61407107 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj +++ b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -12,12 +13,7 @@ | |||
| 12 | </PropertyGroup> | 13 | </PropertyGroup> |
| 13 | 14 | ||
| 14 | <ItemGroup> | 15 | <ItemGroup> |
| 15 | <Content Include="TestData\data\example.txt" CopyToOutputDirectory="PreserveNewest" /> | 16 | <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" /> |
| 16 | <Content Include="TestData\WixUI_Advanced\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 17 | <Content Include="TestData\WixUI_FeatureTree\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 18 | <Content Include="TestData\WixUI_InstallDir\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 19 | <Content Include="TestData\WixUI_Minimal\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 20 | <Content Include="TestData\WixUI_Mondo\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 21 | </ItemGroup> | 17 | </ItemGroup> |
| 22 | 18 | ||
| 23 | <ItemGroup> | 19 | <ItemGroup> |
| @@ -25,19 +21,12 @@ | |||
| 25 | </ItemGroup> | 21 | </ItemGroup> |
| 26 | 22 | ||
| 27 | <ItemGroup> | 23 | <ItemGroup> |
| 28 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 29 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 30 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 31 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 32 | </ItemGroup> | 25 | </ItemGroup> |
| 33 | 26 | ||
| 34 | <ItemGroup> | 27 | <ItemGroup> |
| 35 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 28 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 36 | </ItemGroup> | 29 | <PackageReference Include="xunit" /> |
| 37 | 30 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 38 | <ItemGroup> | ||
| 39 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" /> | ||
| 40 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 41 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="All" /> | ||
| 42 | </ItemGroup> | 31 | </ItemGroup> |
| 43 | </Project> | 32 | </Project> |
diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd new file mode 100644 index 00000000..1b5a3a6c --- /dev/null +++ b/src/ext/UI/ui.cmd | |||
| @@ -0,0 +1,25 @@ | |||
| 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 ext\UI %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | @REM nuget restore || exit /b | ||
| 13 | msbuild -t:Restore -p:RestorePackagesConfig=true -p:Configuration=%_C% || exit /b | ||
| 14 | |||
| 15 | :: Build | ||
| 16 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.UI\WixToolsetTest.UI.csproj || exit /b | ||
| 17 | |||
| 18 | :: Test | ||
| 19 | dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b | ||
| 20 | |||
| 21 | :: Pack | ||
| 22 | msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.UI.wixext.csproj || exit /b | ||
| 23 | |||
| 24 | @popd | ||
| 25 | @endlocal | ||
diff --git a/src/ext/UI/wix.snk b/src/ext/UI/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/UI/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj index 67c949b2..043cb259 100644 --- a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj +++ b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj | |||
| @@ -15,16 +15,12 @@ | |||
| 15 | <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" /> | 15 | <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | 17 | ||
| 18 | <ItemGroup> | 18 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
| 19 | <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> | 19 | <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" /> |
| 20 | </ItemGroup> | ||
| 21 | |||
| 22 | <ItemGroup> | ||
| 23 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | ||
| 24 | </ItemGroup> | 20 | </ItemGroup> |
| 25 | 21 | ||
| 26 | <ItemGroup> | 22 | <ItemGroup> |
| 27 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 23 | <PackageReference Include="WixToolset.Data" /> |
| 28 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 24 | <PackageReference Include="WixToolset.Extensibility" /> |
| 29 | </ItemGroup> | 25 | </ItemGroup> |
| 30 | </Project> | 26 | </Project> |
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec index 51c9708e..504d4458 100644 --- a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec +++ b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec | |||
| @@ -14,10 +14,10 @@ | |||
| 14 | </metadata> | 14 | </metadata> |
| 15 | 15 | ||
| 16 | <files> | 16 | <files> |
| 17 | <file src="$projectFolder$$id$.targets" target="build" /> | 17 | <file src="$projectFolder$\$id$.targets" target="build" /> |
| 18 | 18 | ||
| 19 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 19 | <file src="$id$.dll" target="tools" /> |
| 20 | 20 | ||
| 21 | <file src="x86\*.pdb" target="pdbs\x86" /> | 21 | <file src="..\x86\*.pdb" target="pdbs\x86" /> |
| 22 | </files> | 22 | </files> |
| 23 | </package> | 23 | </package> |
diff --git a/src/ext/UI/wixlib/ui.wixproj b/src/ext/UI/wixlib/ui.wixproj index e9529283..2b335f01 100644 --- a/src/ext/UI/wixlib/ui.wixproj +++ b/src/ext/UI/wixlib/ui.wixproj | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | </ItemGroup> | 31 | </ItemGroup> |
| 32 | 32 | ||
| 33 | <ItemGroup> | 33 | <ItemGroup> |
| 34 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 34 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 35 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 35 | </ItemGroup> | 36 | </ItemGroup> |
| 36 | </Project> | 37 | </Project> |
diff --git a/src/ext/Util/Directory.Build.props b/src/ext/Util/Directory.Build.props index b3c6287c..9c9383c6 100644 --- a/src/ext/Util/Directory.Build.props +++ b/src/ext/Util/Directory.Build.props | |||
| @@ -1,27 +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>Util.wixext</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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | 9 | <Import Project="..\..\Directory.Build.props" /> |
| 26 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 27 | </Project> | 10 | </Project> |
diff --git a/src/ext/Util/Directory.Build.targets b/src/ext/Util/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/Util/Directory.Build.targets +++ /dev/null | |||
| @@ -1,51 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | |||
| 49 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 50 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 51 | </Project> | ||
diff --git a/src/ext/Util/Directory.csproj.props b/src/ext/Util/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/Util/Directory.csproj.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/ext/Util/Directory.csproj.targets b/src/ext/Util/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/Util/Directory.csproj.targets +++ /dev/null | |||
| @@ -1,26 +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\Directory.csproj.targets | ||
| 4 | then update all of the repos. | ||
| 5 | --> | ||
| 6 | <Project> | ||
| 7 | <PropertyGroup> | ||
| 8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 13 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 14 | <PropertyGroup> | ||
| 15 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 16 | |||
| 17 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 18 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath> | ||
| 19 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 20 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 21 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 22 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 23 | </PropertyGroup> | ||
| 24 | </Target> | ||
| 25 | |||
| 26 | </Project> | ||
diff --git a/src/ext/Util/Directory.vcxproj.props b/src/ext/Util/Directory.vcxproj.props deleted file mode 100644 index 11778f41..00000000 --- a/src/ext/Util/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,97 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <PropertyGroup> | ||
| 23 | <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> | ||
| 24 | </PropertyGroup> | ||
| 25 | |||
| 26 | <ItemDefinitionGroup> | ||
| 27 | <ClCompile> | ||
| 28 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 29 | <WarningLevel>Level4</WarningLevel> | ||
| 30 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 31 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 32 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 33 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 34 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 35 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 36 | <ExceptionHandling>false</ExceptionHandling> | ||
| 37 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 38 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 39 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 40 | </ClCompile> | ||
| 41 | <ResourceCompile> | ||
| 42 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 43 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 44 | </ResourceCompile> | ||
| 45 | <Lib> | ||
| 46 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 47 | </Lib> | ||
| 48 | <Link> | ||
| 49 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 50 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 51 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 52 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 53 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 54 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 55 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 56 | </Link> | ||
| 57 | </ItemDefinitionGroup> | ||
| 58 | |||
| 59 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 60 | <ClCompile> | ||
| 61 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 62 | </ClCompile> | ||
| 63 | </ItemDefinitionGroup> | ||
| 64 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 65 | <ClCompile> | ||
| 66 | <CallingConvention>CDecl</CallingConvention> | ||
| 67 | </ClCompile> | ||
| 68 | </ItemDefinitionGroup> | ||
| 69 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 70 | <ClCompile> | ||
| 71 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 72 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 73 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 74 | </ClCompile> | ||
| 75 | </ItemDefinitionGroup> | ||
| 76 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 77 | <ClCompile> | ||
| 78 | <Optimization>Disabled</Optimization> | ||
| 79 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 80 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 81 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 82 | </ClCompile> | ||
| 83 | </ItemDefinitionGroup> | ||
| 84 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 85 | <ClCompile> | ||
| 86 | <Optimization>MinSpace</Optimization> | ||
| 87 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 88 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 89 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 90 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 91 | </ClCompile> | ||
| 92 | <Link> | ||
| 93 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 94 | <OptimizeReferences>true</OptimizeReferences> | ||
| 95 | </Link> | ||
| 96 | </ItemDefinitionGroup> | ||
| 97 | </Project> | ||
diff --git a/src/ext/Util/Util.wixext.sln b/src/ext/Util/Util.wixext.sln index 050fd8b3..259a8164 100644 --- a/src/ext/Util/Util.wixext.sln +++ b/src/ext/Util/Util.wixext.sln | |||
| @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30204.135 | 4 | VisualStudioVersion = 16.0.30204.135 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "src\be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "src\ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}" | 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilca", "ca\utilca.vcxproj", "{076018F7-19BD-423A-ABBF-229273DA08D8}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "src\wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" | 10 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "util", "wixlib\util.wixproj", "{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "src\wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Util.wixext", "wixext\WixToolset.Util.wixext.csproj", "{6CF033EB-0A39-4AC6-9D41-9BD506352045}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" | 14 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Util", "test\WixToolsetTest.Util\WixToolsetTest.Util.csproj", "{D5D34EC4-AF91-4B11-AC0A-FA5242AE924B}" |
| 15 | EndProject | 15 | EndProject |
| 16 | Global | 16 | Global |
| 17 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 17 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/Util/Util.wixext.v3.ncrunchsolution b/src/ext/Util/Util.wixext.v3.ncrunchsolution deleted file mode 100644 index 10420ac9..00000000 --- a/src/ext/Util/Util.wixext.v3.ncrunchsolution +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | <SolutionConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <AllowParallelTestExecution>True</AllowParallelTestExecution> | ||
| 4 | <SolutionConfigured>True</SolutionConfigured> | ||
| 5 | </Settings> | ||
| 6 | </SolutionConfiguration> \ No newline at end of file | ||
diff --git a/src/ext/Util/appveyor.cmd b/src/ext/Util/appveyor.cmd deleted file mode 100644 index 8322ffae..00000000 --- a/src/ext/Util/appveyor.cmd +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | :: Restore | ||
| 7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
| 8 | |||
| 9 | :: Build | ||
| 10 | msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b | ||
| 11 | |||
| 12 | :: Test | ||
| 13 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Util || exit /b | ||
| 14 | |||
| 15 | :: Pack | ||
| 16 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b | ||
| 17 | |||
| 18 | @popd | ||
| 19 | @endlocal | ||
diff --git a/src/ext/Util/appveyor.yml b/src/ext/Util/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/ext/Util/appveyor.yml +++ /dev/null | |||
| @@ -1,40 +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 | |||
| 37 | notifications: | ||
| 38 | - provider: Slack | ||
| 39 | incoming_webhook: | ||
| 40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/Util/be/precomp.h b/src/ext/Util/be/precomp.h index 76d24c7b..bb36b3f3 100644 --- a/src/ext/Util/be/precomp.h +++ b/src/ext/Util/be/precomp.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <msxml2.h> | 16 | #include <msxml2.h> |
| 17 | 17 | ||
| 18 | #define MAXUINT USHRT_MAX | 18 | // #define MAXUINT USHRT_MAX |
| 19 | 19 | ||
| 20 | #include <dutil.h> | 20 | #include <dutil.h> |
| 21 | #include <memutil.h> | 21 | #include <memutil.h> |
diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj index 683b376a..5e5a44d3 100644 --- a/src/ext/Util/be/utilbe.vcxproj +++ b/src/ext/Util/be/utilbe.vcxproj | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | 3 | ||
| 4 | <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 6 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 7 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -69,11 +69,12 @@ | |||
| 69 | </ItemGroup> | 69 | </ItemGroup> |
| 70 | 70 | ||
| 71 | <ItemGroup> | 71 | <ItemGroup> |
| 72 | <PackageReference Include="WixToolset.BextUtil" Version="4.0.58" /> | 72 | <PackageReference Include="WixToolset.DUtil" /> |
| 73 | <PackageReference Include="WixToolset.BootstrapperCore.Native" Version="4.0.141" /> | 73 | <PackageReference Include="WixToolset.BextUtil" /> |
| 74 | <PackageReference Include="WixToolset.DUtil" Version="4.0.72" /> | 74 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> |
| 75 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 75 | |
| 76 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 76 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 77 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 77 | </ItemGroup> | 78 | </ItemGroup> |
| 78 | 79 | ||
| 79 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 80 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
diff --git a/src/ext/Util/ca/precomp.h b/src/ext/Util/ca/precomp.h index c5d6afe5..98e61e1a 100644 --- a/src/ext/Util/ca/precomp.h +++ b/src/ext/Util/ca/precomp.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <shlobj.h> | 22 | #include <shlobj.h> |
| 23 | #include <intshcut.h> | 23 | #include <intshcut.h> |
| 24 | 24 | ||
| 25 | #define MAXUINT USHRT_MAX | 25 | // #define MAXUINT USHRT_MAX |
| 26 | 26 | ||
| 27 | #include "wcautil.h" | 27 | #include "wcautil.h" |
| 28 | #include "wcawow64.h" | 28 | #include "wcawow64.h" |
diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj index 7b64db95..f090181b 100644 --- a/src/ext/Util/ca/utilca.vcxproj +++ b/src/ext/Util/ca/utilca.vcxproj | |||
| @@ -96,10 +96,10 @@ | |||
| 96 | </ItemGroup> | 96 | </ItemGroup> |
| 97 | 97 | ||
| 98 | <ItemGroup> | 98 | <ItemGroup> |
| 99 | <PackageReference Include="WixToolset.Dutil" Version="4.0.72" /> | 99 | <PackageReference Include="WixToolset.Dutil" /> |
| 100 | <PackageReference Include="WixToolset.WcaUtil" Version="4.0.19" /> | 100 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 101 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 101 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 102 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 102 | <PackageReference Include="GitInfo" /> |
| 103 | </ItemGroup> | 103 | </ItemGroup> |
| 104 | 104 | ||
| 105 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 105 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
diff --git a/src/ext/Util/nuget.config b/src/ext/Util/nuget.config deleted file mode 100644 index 8d711148..00000000 --- a/src/ext/Util/nuget.config +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-balutil" value="https://ci.appveyor.com/nuget/wixtoolset-balutil" /> | ||
| 6 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 7 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 8 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 9 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 10 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 11 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 12 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 13 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 14 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 15 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 16 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 17 | </packageSources> | ||
| 18 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index e77ecbed..bb1fc1f7 100644 --- a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -20,19 +21,12 @@ | |||
| 20 | </ItemGroup> | 21 | </ItemGroup> |
| 21 | 22 | ||
| 22 | <ItemGroup> | 23 | <ItemGroup> |
| 23 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 24 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 25 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 26 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 27 | </ItemGroup> | 25 | </ItemGroup> |
| 28 | 26 | ||
| 29 | <ItemGroup> | 27 | <ItemGroup> |
| 30 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 28 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 31 | </ItemGroup> | 29 | <PackageReference Include="xunit" /> |
| 32 | 30 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 33 | <ItemGroup> | ||
| 34 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 35 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 36 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 37 | </ItemGroup> | 31 | </ItemGroup> |
| 38 | </Project> | 32 | </Project> |
diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd new file mode 100644 index 00000000..1b189086 --- /dev/null +++ b/src/ext/Util/util.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 ext\Util %_C% using %_N% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.Util.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/Util/wix.snk b/src/ext/Util/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/Util/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj index 10fc569e..434accf3 100644 --- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj | |||
| @@ -20,12 +20,7 @@ | |||
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | 21 | ||
| 22 | <ItemGroup> | 22 | <ItemGroup> |
| 23 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | 23 | <PackageReference Include="WixToolset.Data" /> |
| 24 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Extensibility" /> |
| 25 | </ItemGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> | ||
| 29 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 30 | </ItemGroup> | 25 | </ItemGroup> |
| 31 | </Project> | 26 | </Project> |
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec index ba3eaade..da07f591 100644 --- a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec | |||
| @@ -14,12 +14,12 @@ | |||
| 14 | </metadata> | 14 | </metadata> |
| 15 | 15 | ||
| 16 | <files> | 16 | <files> |
| 17 | <file src="$projectFolder$$id$.targets" target="build" /> | 17 | <file src="$projectFolder$\$id$.targets" target="build" /> |
| 18 | 18 | ||
| 19 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 19 | <file src="$id$.dll" target="tools" /> |
| 20 | 20 | ||
| 21 | <file src="ARM64\*.pdb" target="pdbs\ARM64" /> | 21 | <file src="..\ARM64\*.pdb" target="pdbs\ARM64" /> |
| 22 | <file src="x86\*.pdb" target="pdbs\x86" /> | 22 | <file src="..\x86\*.pdb" target="pdbs\x86" /> |
| 23 | <file src="x64\*.pdb" target="pdbs\x64" /> | 23 | <file src="..\x64\*.pdb" target="pdbs\x64" /> |
| 24 | </files> | 24 | </files> |
| 25 | </package> | 25 | </package> |
diff --git a/src/ext/Util/wixlib/util.wixproj b/src/ext/Util/wixlib/util.wixproj index 99dede7d..56a16ff4 100644 --- a/src/ext/Util/wixlib/util.wixproj +++ b/src/ext/Util/wixlib/util.wixproj | |||
| @@ -1,6 +1,5 @@ | |||
| 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 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | |||
| 4 | <PropertyGroup> | 3 | <PropertyGroup> |
| 5 | <OutputType>Library</OutputType> | 4 | <OutputType>Library</OutputType> |
| 6 | <BindFiles>true</BindFiles> | 5 | <BindFiles>true</BindFiles> |
| @@ -22,6 +21,7 @@ | |||
| 22 | </ItemGroup> | 21 | </ItemGroup> |
| 23 | 22 | ||
| 24 | <ItemGroup> | 23 | <ItemGroup> |
| 25 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 24 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 25 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 26 | </ItemGroup> | 26 | </ItemGroup> |
| 27 | </Project> | 27 | </Project> |
diff --git a/src/ext/VisualStudio/CSharp.Build.props b/src/ext/VisualStudio/CSharp.Build.props deleted file mode 100644 index b12f4c6e..00000000 --- a/src/ext/VisualStudio/CSharp.Build.props +++ /dev/null | |||
| @@ -1,11 +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 | <SignAssembly>true</SignAssembly> | ||
| 9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | </Project> | ||
diff --git a/src/ext/VisualStudio/Cpp.Build.props b/src/ext/VisualStudio/Cpp.Build.props deleted file mode 100644 index 9b7a1bb5..00000000 --- a/src/ext/VisualStudio/Cpp.Build.props +++ /dev/null | |||
| @@ -1,86 +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)'=='Release' "> | ||
| 74 | <ClCompile> | ||
| 75 | <Optimization>MinSpace</Optimization> | ||
| 76 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 78 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 79 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 80 | </ClCompile> | ||
| 81 | <Link> | ||
| 82 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 83 | <OptimizeReferences>true</OptimizeReferences> | ||
| 84 | </Link> | ||
| 85 | </ItemDefinitionGroup> | ||
| 86 | </Project> | ||
diff --git a/src/ext/VisualStudio/Directory.Build.props b/src/ext/VisualStudio/Directory.Build.props index b3c6287c..ed281d79 100644 --- a/src/ext/VisualStudio/Directory.Build.props +++ b/src/ext/VisualStudio/Directory.Build.props | |||
| @@ -1,27 +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>VisualStudio.wixext</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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | 9 | <Import Project="..\..\Directory.Build.props" /> |
| 26 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 27 | </Project> | 10 | </Project> |
diff --git a/src/ext/VisualStudio/Directory.Build.targets b/src/ext/VisualStudio/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/ext/VisualStudio/Directory.Build.targets +++ /dev/null | |||
| @@ -1,51 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | |||
| 49 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 50 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 51 | </Project> | ||
diff --git a/src/ext/VisualStudio/Directory.csproj.props b/src/ext/VisualStudio/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/ext/VisualStudio/Directory.csproj.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/ext/VisualStudio/Directory.csproj.targets b/src/ext/VisualStudio/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/ext/VisualStudio/Directory.csproj.targets +++ /dev/null | |||
| @@ -1,26 +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\Directory.csproj.targets | ||
| 4 | then update all of the repos. | ||
| 5 | --> | ||
| 6 | <Project> | ||
| 7 | <PropertyGroup> | ||
| 8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 13 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 14 | <PropertyGroup> | ||
| 15 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 16 | |||
| 17 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 18 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath> | ||
| 19 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 20 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 21 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 22 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 23 | </PropertyGroup> | ||
| 24 | </Target> | ||
| 25 | |||
| 26 | </Project> | ||
diff --git a/src/ext/VisualStudio/Directory.vcxproj.props b/src/ext/VisualStudio/Directory.vcxproj.props deleted file mode 100644 index bcf26c57..00000000 --- a/src/ext/VisualStudio/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,111 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <ItemDefinitionGroup> | ||
| 23 | <ClCompile> | ||
| 24 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 25 | <WarningLevel>Level4</WarningLevel> | ||
| 26 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 27 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 28 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 29 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 30 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 31 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 32 | <ExceptionHandling>false</ExceptionHandling> | ||
| 33 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 34 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 35 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 36 | </ClCompile> | ||
| 37 | <ResourceCompile> | ||
| 38 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 39 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 40 | </ResourceCompile> | ||
| 41 | <Lib> | ||
| 42 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 43 | </Lib> | ||
| 44 | <Link> | ||
| 45 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 46 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 47 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 48 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 49 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 50 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 51 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 52 | </Link> | ||
| 53 | </ItemDefinitionGroup> | ||
| 54 | |||
| 55 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 56 | <ClCompile> | ||
| 57 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 58 | </ClCompile> | ||
| 59 | </ItemDefinitionGroup> | ||
| 60 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 61 | <ClCompile> | ||
| 62 | <CallingConvention>CDecl</CallingConvention> | ||
| 63 | </ClCompile> | ||
| 64 | </ItemDefinitionGroup> | ||
| 65 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 66 | <ClCompile> | ||
| 67 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 68 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 69 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 70 | </ClCompile> | ||
| 71 | </ItemDefinitionGroup> | ||
| 72 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 73 | <ClCompile> | ||
| 74 | <Optimization>Disabled</Optimization> | ||
| 75 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 76 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 78 | </ClCompile> | ||
| 79 | </ItemDefinitionGroup> | ||
| 80 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | ||
| 81 | <ClCompile> | ||
| 82 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 83 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | ||
| 84 | </ClCompile> | ||
| 85 | </ItemDefinitionGroup> | ||
| 86 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 87 | <ClCompile> | ||
| 88 | <Optimization>MinSpace</Optimization> | ||
| 89 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 90 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 91 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 92 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 93 | </ClCompile> | ||
| 94 | <Link> | ||
| 95 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 96 | <OptimizeReferences>true</OptimizeReferences> | ||
| 97 | </Link> | ||
| 98 | </ItemDefinitionGroup> | ||
| 99 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | ||
| 100 | <ClCompile> | ||
| 101 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 102 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | ||
| 103 | </ClCompile> | ||
| 104 | </ItemDefinitionGroup> | ||
| 105 | <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' "> | ||
| 106 | <Link> | ||
| 107 | <KeyFile>$(LinkKeyFile)</KeyFile> | ||
| 108 | <DelaySign>$(LinkDelaySign)</DelaySign> | ||
| 109 | </Link> | ||
| 110 | </ItemDefinitionGroup> | ||
| 111 | </Project> | ||
diff --git a/src/ext/VisualStudio/VisualStudio.wixext.sln b/src/ext/VisualStudio/VisualStudio.wixext.sln index 9d6a8356..5f30fbcf 100644 --- a/src/ext/VisualStudio/VisualStudio.wixext.sln +++ b/src/ext/VisualStudio/VisualStudio.wixext.sln | |||
| @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30611.23 | 4 | VisualStudioVersion = 16.0.30611.23 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsca", "src\ca\vsca.vcxproj", "{45308B85-0628-4978-8FC8-6AD9E1AD5949}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsca", "ca\vsca.vcxproj", "{45308B85-0628-4978-8FC8-6AD9E1AD5949}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "vs", "src\wixlib\vs.wixproj", "{14345C9D-8AF8-435A-BB1B-E067CE7EB321}" | 8 | Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "vs", "wixlib\vs.wixproj", "{14345C9D-8AF8-435A-BB1B-E067CE7EB321}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.VisualStudio.wixext", "src\wixext\WixToolset.VisualStudio.wixext.csproj", "{61BFD377-9DE1-48B4-8687-560DF68D6F3B}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.VisualStudio.wixext", "wixext\WixToolset.VisualStudio.wixext.csproj", "{61BFD377-9DE1-48B4-8687-560DF68D6F3B}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.VisualStudio", "src\test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj", "{DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.VisualStudio", "test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj", "{DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/ext/VisualStudio/appveyor.cmd b/src/ext/VisualStudio/appveyor.cmd deleted file mode 100644 index 847809c3..00000000 --- a/src/ext/VisualStudio/appveyor.cmd +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | :: Restore | ||
| 7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
| 8 | |||
| 9 | :: Build | ||
| 10 | msbuild -p:Configuration=%_C% src\test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj || exit /b | ||
| 11 | |||
| 12 | :: Test | ||
| 13 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.VisualStudio || exit /b | ||
| 14 | |||
| 15 | :: Pack | ||
| 16 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.VisualStudio.wixext.csproj || exit /b | ||
| 17 | |||
| 18 | @popd | ||
| 19 | @endlocal | ||
diff --git a/src/ext/VisualStudio/appveyor.yml b/src/ext/VisualStudio/appveyor.yml deleted file mode 100644 index c53cc9cc..00000000 --- a/src/ext/VisualStudio/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\**\*.snupkg | ||
| 37 | name: snupkg | ||
| 38 | |||
| 39 | notifications: | ||
| 40 | - provider: Slack | ||
| 41 | incoming_webhook: | ||
| 42 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/ext/VisualStudio/ca/precomp.h b/src/ext/VisualStudio/ca/precomp.h index 3edad7ed..a08ca180 100644 --- a/src/ext/VisualStudio/ca/precomp.h +++ b/src/ext/VisualStudio/ca/precomp.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #include <windows.h> | 5 | #include <windows.h> |
| 6 | #include <msiquery.h> | 6 | #include <msiquery.h> |
| 7 | 7 | ||
| 8 | #define MAXUINT USHRT_MAX | ||
| 9 | #include <Setup.Configuration.h> | 8 | #include <Setup.Configuration.h> |
| 10 | 9 | ||
| 11 | #include "wcautil.h" | 10 | #include "wcautil.h" |
diff --git a/src/ext/VisualStudio/ca/vsca.vcxproj b/src/ext/VisualStudio/ca/vsca.vcxproj index f4fbcc46..8d6a3500 100644 --- a/src/ext/VisualStudio/ca/vsca.vcxproj +++ b/src/ext/VisualStudio/ca/vsca.vcxproj | |||
| @@ -47,11 +47,11 @@ | |||
| 47 | </ItemGroup> | 47 | </ItemGroup> |
| 48 | 48 | ||
| 49 | <ItemGroup> | 49 | <ItemGroup> |
| 50 | <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" /> | 50 | <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" /> |
| 51 | <PackageReference Include="WixToolset.Dutil" Version="4.0.65" /> | 51 | <PackageReference Include="WixToolset.Dutil" /> |
| 52 | <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" /> | 52 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 53 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 53 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 54 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 54 | <PackageReference Include="GitInfo" /> |
| 55 | </ItemGroup> | 55 | </ItemGroup> |
| 56 | 56 | ||
| 57 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 57 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
diff --git a/src/ext/VisualStudio/nuget.config b/src/ext/VisualStudio/nuget.config deleted file mode 100644 index 6fb99260..00000000 --- a/src/ext/VisualStudio/nuget.config +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 7 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 8 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 9 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 10 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 11 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 12 | <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" /> | ||
| 13 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 16 | </packageSources> | ||
| 17 | </configuration> \ No newline at end of file | ||
diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj index 9172569f..fcd78ef5 100644 --- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj +++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <PropertyGroup> | 11 | <PropertyGroup> |
| @@ -20,19 +21,12 @@ | |||
| 20 | </ItemGroup> | 21 | </ItemGroup> |
| 21 | 22 | ||
| 22 | <ItemGroup> | 23 | <ItemGroup> |
| 23 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Core.TestPackage" /> |
| 24 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 25 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 26 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 27 | </ItemGroup> | 25 | </ItemGroup> |
| 28 | 26 | ||
| 29 | <ItemGroup> | 27 | <ItemGroup> |
| 30 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 28 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 31 | </ItemGroup> | 29 | <PackageReference Include="xunit" /> |
| 32 | 30 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | |
| 33 | <ItemGroup> | ||
| 34 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | ||
| 35 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 36 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 37 | </ItemGroup> | 31 | </ItemGroup> |
| 38 | </Project> | 32 | </Project> |
diff --git a/src/ext/VisualStudio/vs.cmd b/src/ext/VisualStudio/vs.cmd new file mode 100644 index 00000000..21a9768b --- /dev/null +++ b/src/ext/VisualStudio/vs.cmd | |||
| @@ -0,0 +1,24 @@ | |||
| 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 VisualStudio.wixext build %_C% | ||
| 10 | |||
| 11 | :: Restore | ||
| 12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Build | ||
| 15 | msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj || exit /b | ||
| 16 | |||
| 17 | :: Test | ||
| 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.VisualStudio || exit /b | ||
| 19 | |||
| 20 | :: Pack | ||
| 21 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.VisualStudio.wixext.csproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal | ||
diff --git a/src/ext/VisualStudio/wix.snk b/src/ext/VisualStudio/wix.snk deleted file mode 100644 index 3908a66a..00000000 --- a/src/ext/VisualStudio/wix.snk +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj index 20282720..8a3a8e6f 100644 --- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj +++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj | |||
| @@ -20,11 +20,6 @@ | |||
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | 21 | ||
| 22 | <ItemGroup> | 22 | <ItemGroup> |
| 23 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 23 | <PackageReference Include="WixToolset.Extensibility" /> |
| 24 | </ItemGroup> | ||
| 25 | |||
| 26 | <ItemGroup> | ||
| 27 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> | ||
| 28 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
| 29 | </ItemGroup> | 24 | </ItemGroup> |
| 30 | </Project> | 25 | </Project> |
diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec index 51c9708e..504d4458 100644 --- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec +++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec | |||
| @@ -14,10 +14,10 @@ | |||
| 14 | </metadata> | 14 | </metadata> |
| 15 | 15 | ||
| 16 | <files> | 16 | <files> |
| 17 | <file src="$projectFolder$$id$.targets" target="build" /> | 17 | <file src="$projectFolder$\$id$.targets" target="build" /> |
| 18 | 18 | ||
| 19 | <file src="netstandard2.0\$id$.dll" target="tools" /> | 19 | <file src="$id$.dll" target="tools" /> |
| 20 | 20 | ||
| 21 | <file src="x86\*.pdb" target="pdbs\x86" /> | 21 | <file src="..\x86\*.pdb" target="pdbs\x86" /> |
| 22 | </files> | 22 | </files> |
| 23 | </package> | 23 | </package> |
diff --git a/src/ext/VisualStudio/wixlib/HTML_Help_Registration__RTL_X86.wxs b/src/ext/VisualStudio/wixlib/HTML_Help_Registration__RTL_X86.wxs index 2bdb810a..881da279 100644 --- a/src/ext/VisualStudio/wixlib/HTML_Help_Registration__RTL_X86.wxs +++ b/src/ext/VisualStudio/wixlib/HTML_Help_Registration__RTL_X86.wxs | |||
| @@ -2,14 +2,14 @@ | |||
| 2 | 2 | ||
| 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 4 | <Fragment> | 4 | <Fragment> |
| 5 | <DirectoryRef Id="CommonFilesFolder"> | 5 | <StandardDirectory Id="CommonFilesFolder"> |
| 6 | <Directory Id="MSShared" Name="Microsoft Shared"> | 6 | <Directory Id="MSShared" Name="Microsoft Shared"> |
| 7 | <Directory Id="DevHelp" Name="DevHelp"> | 7 | <Directory Id="DevHelp" Name="DevHelp"> |
| 8 | <Directory Id="VSIPCC" Name="VSIPCC"> | 8 | <Directory Id="VSIPCC" Name="VSIPCC"> |
| 9 | </Directory> | 9 | </Directory> |
| 10 | </Directory> | 10 | </Directory> |
| 11 | </Directory> | 11 | </Directory> |
| 12 | </DirectoryRef> | 12 | </StandardDirectory> |
| 13 | </Fragment> | 13 | </Fragment> |
| 14 | 14 | ||
| 15 | <Fragment Id="HTML_Help_Registration_"> | 15 | <Fragment Id="HTML_Help_Registration_"> |
diff --git a/src/ext/VisualStudio/wixlib/vs.wixproj b/src/ext/VisualStudio/wixlib/vs.wixproj index db3e2cff..f2852683 100644 --- a/src/ext/VisualStudio/wixlib/vs.wixproj +++ b/src/ext/VisualStudio/wixlib/vs.wixproj | |||
| @@ -2,7 +2,6 @@ | |||
| 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 | <Project Sdk="WixToolset.Sdk"> | 4 | <Project Sdk="WixToolset.Sdk"> |
| 5 | |||
| 6 | <PropertyGroup> | 5 | <PropertyGroup> |
| 7 | <OutputType>Library</OutputType> | 6 | <OutputType>Library</OutputType> |
| 8 | <BindFiles>true</BindFiles> | 7 | <BindFiles>true</BindFiles> |
| @@ -14,6 +13,7 @@ | |||
| 14 | </ItemGroup> | 13 | </ItemGroup> |
| 15 | 14 | ||
| 16 | <ItemGroup> | 15 | <ItemGroup> |
| 17 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 16 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 17 | <PackageReference Include="GitInfo" /> | ||
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> | 19 | </Project> |
diff --git a/src/ext/ext.cmd b/src/ext/ext.cmd new file mode 100644 index 00000000..49120180 --- /dev/null +++ b/src/ext/ext.cmd | |||
| @@ -0,0 +1,62 @@ | |||
| 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 ext build %_C% | ||
| 10 | |||
| 11 | :: These extensions must be built in this order. | ||
| 12 | |||
| 13 | :: Util | ||
| 14 | call Util\util.cmd %_C% || exit /b | ||
| 15 | |||
| 16 | :: Bal | ||
| 17 | call Bal\bal.cmd %_C% || exit /b | ||
| 18 | |||
| 19 | :: NetFx | ||
| 20 | call NetFx\netfx.cmd %_C% || exit /b | ||
| 21 | |||
| 22 | |||
| 23 | :: The rest of the extensions are in alphabetical order. | ||
| 24 | |||
| 25 | :: ComPlus | ||
| 26 | call ComPlus\complus.cmd %_C% || exit /b | ||
| 27 | |||
| 28 | :: Dependency | ||
| 29 | call Dependency\dependency.cmd %_C% || exit /b | ||
| 30 | |||
| 31 | :: DifxApp | ||
| 32 | call DifxApp\difxapp.cmd %_C% || exit /b | ||
| 33 | |||
| 34 | :: DirectX | ||
| 35 | call DirectX\directx.cmd %_C% || exit /b | ||
| 36 | |||
| 37 | :: Firewall | ||
| 38 | call Firewall\firewall.cmd %_C% || exit /b | ||
| 39 | |||
| 40 | :: Http | ||
| 41 | call Http\http.cmd %_C% || exit /b | ||
| 42 | |||
| 43 | :: Iis | ||
| 44 | call Iis\iis.cmd %_C% || exit /b | ||
| 45 | |||
| 46 | :: Msmq | ||
| 47 | call Msmq\msmq.cmd %_C% || exit /b | ||
| 48 | |||
| 49 | :: PowerShell | ||
| 50 | call PowerShell\ps.cmd %_C% || exit /b | ||
| 51 | |||
| 52 | :: Sql | ||
| 53 | call Sql\sql.cmd %_C% || exit /b | ||
| 54 | |||
| 55 | :: UI | ||
| 56 | call UI\ui.cmd %_C% || exit /b | ||
| 57 | |||
| 58 | :: VisualStudio | ||
| 59 | call VisualStudio\vs.cmd %_C% || exit /b | ||
| 60 | |||
| 61 | @popd | ||
| 62 | @endlocal | ||
diff --git a/src/internal/CSharp.Build.props b/src/internal/CSharp.Build.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/internal/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/internal/Cpp.Build.props b/src/internal/Cpp.Build.props deleted file mode 100644 index 44a042c7..00000000 --- a/src/internal/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/internal/Directory.Build.props b/src/internal/Directory.Build.props index f83cc154..70d374e0 100644 --- a/src/internal/Directory.Build.props +++ b/src/internal/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>internal</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/internal/Directory.Build.targets b/src/internal/Directory.Build.targets deleted file mode 100644 index cb988931..00000000 --- a/src/internal/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/internal/MessagesToMessages/MessagesToMessages.csproj b/src/internal/MessagesToMessages/MessagesToMessages.csproj index ce1697ae..98b874f6 100644 --- a/src/internal/MessagesToMessages/MessagesToMessages.csproj +++ b/src/internal/MessagesToMessages/MessagesToMessages.csproj | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <OutputType>Exe</OutputType> | 4 | <OutputType>Exe</OutputType> |
| 5 | <TargetFramework>netcoreapp2.0</TargetFramework> | 5 | <TargetFramework>netcoreapp2.0</TargetFramework> |
| 6 | <SignOutput>false</SignOutput> | ||
| 6 | </PropertyGroup> | 7 | </PropertyGroup> |
| 7 | 8 | ||
| 8 | </Project> | 9 | </Project> |
diff --git a/src/internal/README.md b/src/internal/README.md index da42c09e..e99dcc3b 100644 --- a/src/internal/README.md +++ b/src/internal/README.md | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | # WixBuildTools | 1 | # Internal |
| 2 | Internal shared props/targets/tools used to build the WiX Toolset | 2 | |
| 3 | Internal tooling used to build the WiX Toolset. | ||
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp new file mode 100644 index 00000000..1117eab7 --- /dev/null +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp | |||
| @@ -0,0 +1,86 @@ | |||
| 1 | <Project> | ||
| 2 | <PropertyGroup> | ||
| 3 | <DtfBuildSuffix>-build.1</DtfBuildSuffix> | ||
| 4 | <InternalBuildSuffix>-build.2</InternalBuildSuffix> | ||
| 5 | <LibsBuildSuffix>-build.1</LibsBuildSuffix> | ||
| 6 | <ApiBuildSuffix>-build.2</ApiBuildSuffix> | ||
| 7 | <BurnBuildSuffix>-build.2</BurnBuildSuffix> | ||
| 8 | <WixBuildSuffix>-build.3</WixBuildSuffix> | ||
| 9 | <BalBuildSuffix>-build.2</BalBuildSuffix> | ||
| 10 | <UtilBuildSuffix>-build.1</UtilBuildSuffix> | ||
| 11 | </PropertyGroup> | ||
| 12 | |||
| 13 | <ItemGroup> | ||
| 14 | <PackageVersion Include="WixToolset.Dtf.Compression" Version="{packageversion}" /> | ||
| 15 | <PackageVersion Include="WixToolset.Dtf.Compression.Cab" Version="{packageversion}" /> | ||
| 16 | <PackageVersion Include="WixToolset.Dtf.Resources" Version="{packageversion}" /> | ||
| 17 | <PackageVersion Include="WixToolset.Dtf.WindowsInstaller" Version="{packageversion}" /> | ||
| 18 | |||
| 19 | <PackageVersion Include="WixBuildTools.TestSupport" Version="{packageversion}" /> | ||
| 20 | <PackageVersion Include="WixBuildTools.TestSupport.Native" Version="{packageversion}" /> | ||
| 21 | |||
| 22 | <PackageVersion Include="WixToolset.DUtil" Version="{packageversion}" /> | ||
| 23 | <PackageVersion Include="WixToolset.WcaUtil" Version="{packageversion}" /> | ||
| 24 | |||
| 25 | <PackageVersion Include="WixToolset.BootstrapperCore.Native" Version="{packageversion}" /> | ||
| 26 | <PackageVersion Include="WixToolset.BalUtil" Version="{packageversion}" /> | ||
| 27 | <PackageVersion Include="WixToolset.BextUtil" Version="{packageversion}" /> | ||
| 28 | <PackageVersion Include="WixToolset.Mba.Core" Version="{packageversion}" /> | ||
| 29 | |||
| 30 | <PackageVersion Include="WixToolset.Data" Version="{packageversion}" /> | ||
| 31 | <PackageVersion Include="WixToolset.Extensibility" Version="{packageversion}" /> | ||
| 32 | |||
| 33 | <PackageVersion Include="WixToolset.Burn" Version="{packageversion}" /> | ||
| 34 | |||
| 35 | <PackageVersion Include="WixToolset.Core" Version="{packageversion}" /> | ||
| 36 | <PackageVersion Include="WixToolset.Core.Burn" Version="{packageversion}" /> | ||
| 37 | <PackageVersion Include="WixToolset.Core.WindowsInstaller" Version="{packageversion}" /> | ||
| 38 | <PackageVersion Include="WixToolset.Core.TestPackage" Version="{packageversion}" /> | ||
| 39 | |||
| 40 | <PackageVersion Include="WixToolset.Bal.wixext" Version="{packageversion}" /> | ||
| 41 | <PackageVersion Include="WixToolset.Dependency.wixext" Version="{packageversion}" /> | ||
| 42 | <PackageVersion Include="WixToolset.NetFx.wixext" Version="{packageversion}" /> | ||
| 43 | <PackageVersion Include="WixToolset.Util.wixext" Version="{packageversion}" /> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | <ItemGroup> | ||
| 47 | <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" /> | ||
| 48 | <PackageVersion Include="System.DirectoryServices" Version="4.7.0" /> | ||
| 49 | <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.6.0" /> | ||
| 50 | <PackageVersion Include="System.IO.Compression" Version="4.3.0" /> | ||
| 51 | <PackageVersion Include="System.Reflection.Metadata" Version="1.6.0" /> | ||
| 52 | <PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" /> | ||
| 53 | <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.6.0" /> | ||
| 54 | |||
| 55 | <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" /> | ||
| 56 | <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" /> | ||
| 57 | <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" /> | ||
| 58 | <PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" /> | ||
| 59 | |||
| 60 | <PackageVersion Include="NuGet.Credentials" Version="5.6.0" /> | ||
| 61 | <PackageVersion Include="NuGet.Protocol" Version="5.6.0" /> | ||
| 62 | <PackageVersion Include="NuGet.Versioning" Version="5.6.0" /> | ||
| 63 | </ItemGroup> | ||
| 64 | |||
| 65 | |||
| 66 | |||
| 67 | <ItemGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" > | ||
| 68 | <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3"/> | ||
| 69 | </ItemGroup> | ||
| 70 | |||
| 71 | <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netcoreapp3.1'"> | ||
| 72 | <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" /> | ||
| 73 | </ItemGroup> | ||
| 74 | |||
| 75 | <ItemGroup> | ||
| 76 | <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | ||
| 77 | <PackageVersion Include="GitInfo" Version="2.1.2" /> | ||
| 78 | </ItemGroup> | ||
| 79 | |||
| 80 | <ItemGroup> | ||
| 81 | <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.8.3" /> | ||
| 82 | <PackageVersion Include="xunit" Version="2.4.1" /> | ||
| 83 | <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" /> | ||
| 84 | <PackageVersion Include="xunit.assert" Version="2.4.1" /> | ||
| 85 | </ItemGroup> | ||
| 86 | </Project> | ||
diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj new file mode 100644 index 00000000..e0993cd3 --- /dev/null +++ b/src/internal/SetBuildNumber/SetBuildNumber.proj | |||
| @@ -0,0 +1,96 @@ | |||
| 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 Sdk="Microsoft.Build.NoTargets/3.0.4"> | ||
| 5 | <PropertyGroup> | ||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| 7 | <!-- Disable central package version management since this project will write the central package version management file --> | ||
| 8 | <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally> | ||
| 9 | |||
| 10 | <!-- Explicitly set the restore sources because this project may run before the build\artifacts folder has been created --> | ||
| 11 | <RestoreSources>https://api.nuget.org/v3/index.json</RestoreSources> | ||
| 12 | <RestoreIgnoreFailedSources>true</RestoreIgnoreFailedSources> | ||
| 13 | </PropertyGroup> | ||
| 14 | |||
| 15 | <PropertyGroup> | ||
| 16 | <SetBuildNumbersDependsOn> | ||
| 17 | __SetPropertiesFromGit; | ||
| 18 | SetAppVeyorBuildNumber; | ||
| 19 | SetGlobalJson; | ||
| 20 | SetDirectoryPackagesProps; | ||
| 21 | </SetBuildNumbersDependsOn> | ||
| 22 | |||
| 23 | <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\global.json))</GlobalJsonPath> | ||
| 24 | <CentralPackageVersionsPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\Directory.Packages.props))</CentralPackageVersionsPath> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <Target Name="SetAppVeyorBuildNumber" | ||
| 28 | Condition=" '$(APPVEYOR)'=='True' "> | ||
| 29 | <PropertyGroup> | ||
| 30 | <AppVeyorBuildNumber>$(InformationalVersion)</AppVeyorBuildNumber> | ||
| 31 | <AppVeyorBuildNumber Condition=" 'APPVEYOR_PULL_REQUEST_NUMBER'!='' ">PR#$(APPVEYOR_PULL_REQUEST_NUMBER)-$(AppVeyorBuildNumber)</AppVeyorBuildNumber> | ||
| 32 | </PropertyGroup> | ||
| 33 | |||
| 34 | <Message Importance="high" Text=" $(AppVeyorBuildNumber)" /> | ||
| 35 | |||
| 36 | <Exec Command='appveyor UpdateBuild -Version "$(AppVeyorBuildNumber)"' /> | ||
| 37 | </Target> | ||
| 38 | |||
| 39 | |||
| 40 | <Target Name="SetGlobalJson" | ||
| 41 | Inputs="global.json.pp" | ||
| 42 | Outputs="$(GlobalJsonPath)"> | ||
| 43 | <PropertyGroup> | ||
| 44 | <GlobaJsonTextHeader>/* DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\global.json.pp */</GlobaJsonTextHeader> | ||
| 45 | <GlobalJsonText>$([System.IO.File]::ReadAllText(global.json.pp))</GlobalJsonText> | ||
| 46 | <GlobalJsonText>$(GlobalJsonText.Replace('{apiversion}', $(ApiVersion)))</GlobalJsonText> | ||
| 47 | <GlobalJsonText>$(GlobalJsonText.Replace('{fileversion}', $(FileVersion)))</GlobalJsonText> | ||
| 48 | <GlobalJsonText>$(GlobalJsonText.Replace('{fullversion}', $(InformationalVersion)))</GlobalJsonText> | ||
| 49 | <GlobalJsonText>$(GlobalJsonText.Replace('{informationalversion}', $(InformationalVersion)))</GlobalJsonText> | ||
| 50 | <GlobalJsonText>$(GlobalJsonText.Replace('{height}', $(GitCommits)))</GlobalJsonText> | ||
| 51 | <GlobalJsonText>$(GlobalJsonText.Replace('{packageversion}', $(PackageVersion)))</GlobalJsonText> | ||
| 52 | <GlobalJsonText>$(GlobalJsonText.Replace('{version}', $(Version)))</GlobalJsonText> | ||
| 53 | </PropertyGroup> | ||
| 54 | |||
| 55 | <WriteLinesToFile File="$(GlobalJsonPath)" | ||
| 56 | Lines="$(GlobaJsonTextHeader);$(GlobalJsonText)" | ||
| 57 | Overwrite="true" | ||
| 58 | WriteOnlyWhenDifferent="true" /> | ||
| 59 | |||
| 60 | <Message Importance="high" Text="$(MSBuildProjectName) -> $(GlobalJsonPath)" /> | ||
| 61 | </Target> | ||
| 62 | |||
| 63 | |||
| 64 | <Target Name="SetDirectoryPackagesProps" | ||
| 65 | Inputs="Directory.Packages.props.pp" | ||
| 66 | Outputs="$(CentralPackageVersionsPath)"> | ||
| 67 | <PropertyGroup> | ||
| 68 | <CentralPackageVersionsTextHeader><!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\Directory.Packages.props.pp --></CentralPackageVersionsTextHeader> | ||
| 69 | <CentralPackageVersionsText>$([System.IO.File]::ReadAllText(Directory.Packages.props.pp))</CentralPackageVersionsText> | ||
| 70 | <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{apiversion}', $(ApiVersion)))</CentralPackageVersionsText> | ||
| 71 | <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{fileversion}', $(FileVersion)))</CentralPackageVersionsText> | ||
| 72 | <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{fullversion}', $(InformationalVersion)))</CentralPackageVersionsText> | ||
| 73 | <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{informationalversion}', $(InformationalVersion)))</CentralPackageVersionsText> | ||
| 74 | <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{height}', $(GitCommits)))</CentralPackageVersionsText> | ||
| 75 | <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{packageversion}', $(PackageVersion)))</CentralPackageVersionsText> | ||
| 76 | <CentralPackageVersionsText>$(CentralPackageVersionsText.Replace('{version}', $(Version)))</CentralPackageVersionsText> | ||
| 77 | </PropertyGroup> | ||
| 78 | |||
| 79 | <WriteLinesToFile File="$(CentralPackageVersionsPath)" | ||
| 80 | Lines="$(CentralPackageVersionsTextHeader);$(CentralPackageVersionsText)" | ||
| 81 | Overwrite="true" | ||
| 82 | WriteOnlyWhenDifferent="true" /> | ||
| 83 | |||
| 84 | <Message Importance="high" Text="$(MSBuildProjectName) -> $(CentralPackageVersionsPath)" /> | ||
| 85 | </Target> | ||
| 86 | |||
| 87 | |||
| 88 | <Target Name="SetBuildNumbers" | ||
| 89 | DependsOnTargets="$(SetBuildNumbersDependsOn)" | ||
| 90 | BeforeTargets="AfterBuild" /> | ||
| 91 | |||
| 92 | |||
| 93 | <ItemGroup> | ||
| 94 | <PackageReference Include="GitInfo" Version="2.1.2" /> | ||
| 95 | </ItemGroup> | ||
| 96 | </Project> | ||
diff --git a/src/ext/global.json b/src/internal/SetBuildNumber/global.json.pp index 697f5687..a1d6244a 100644 --- a/src/ext/global.json +++ b/src/internal/SetBuildNumber/global.json.pp | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
| 3 | "WixToolset.Sdk": "4.0.0-build-0213" | 3 | "WixToolset.Sdk": "{packageversion}" |
| 4 | }, | 4 | }, |
| 5 | "sdk": { | 5 | "sdk": { |
| 6 | "allowPrerelease": false | 6 | "allowPrerelease": false |
diff --git a/src/internal/TablesAndTuples/TablesAndTuples.csproj b/src/internal/TablesAndTuples/TablesAndTuples.csproj index ce1697ae..98b874f6 100644 --- a/src/internal/TablesAndTuples/TablesAndTuples.csproj +++ b/src/internal/TablesAndTuples/TablesAndTuples.csproj | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <OutputType>Exe</OutputType> | 4 | <OutputType>Exe</OutputType> |
| 5 | <TargetFramework>netcoreapp2.0</TargetFramework> | 5 | <TargetFramework>netcoreapp2.0</TargetFramework> |
| 6 | <SignOutput>false</SignOutput> | ||
| 6 | </PropertyGroup> | 7 | </PropertyGroup> |
| 7 | 8 | ||
| 8 | </Project> | 9 | </Project> |
diff --git a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj index 954ffa59..421f0713 100644 --- a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj +++ b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
| 9 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 9 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 10 | <NoWarn>CS0618</NoWarn> | 10 | <NoWarn>CS0618</NoWarn> |
| 11 | <SignOutput>false</SignOutput> | ||
| 11 | </PropertyGroup> | 12 | </PropertyGroup> |
| 12 | 13 | ||
| 13 | <ItemGroup> | 14 | <ItemGroup> |
| @@ -21,7 +22,7 @@ | |||
| 21 | 22 | ||
| 22 | <ItemGroup> | 23 | <ItemGroup> |
| 23 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 24 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> |
| 24 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 25 | <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" /> |
| 25 | </ItemGroup> | 26 | </ItemGroup> |
| 26 | 27 | ||
| 27 | </Project> | 28 | </Project> |
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec index 2852826b..1dcdb78c 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec +++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec | |||
| @@ -3,13 +3,13 @@ | |||
| 3 | <metadata minClientVersion="4.0"> | 3 | <metadata minClientVersion="4.0"> |
| 4 | <id>$id$</id> | 4 | <id>$id$</id> |
| 5 | <version>$version$</version> | 5 | <version>$version$</version> |
| 6 | <title>$title$</title> | ||
| 7 | <description>$description$</description> | ||
| 6 | <authors>$authors$</authors> | 8 | <authors>$authors$</authors> |
| 7 | <owners>$authors$</owners> | ||
| 8 | <license type="expression">MS-RL</license> | 9 | <license type="expression">MS-RL</license> |
| 9 | <projectUrl>https://github.com/wixtoolset/WixBuildTools</projectUrl> | ||
| 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
| 11 | <description>$description$</description> | ||
| 12 | <copyright>$copyright$</copyright> | 11 | <copyright>$copyright$</copyright> |
| 12 | <projectUrl>$projectUrl$</projectUrl> | ||
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> |
| 14 | <dependencies> | 14 | <dependencies> |
| 15 | <group targetFramework=".NETFramework4.7.2" /> | 15 | <group targetFramework=".NETFramework4.7.2" /> |
| @@ -17,10 +17,10 @@ | |||
| 17 | </metadata> | 17 | </metadata> |
| 18 | 18 | ||
| 19 | <files> | 19 | <files> |
| 20 | <file src="build\$id$.props" target="build" /> | 20 | <file src="$projectFolder$\build\$id$.props" target="build" /> |
| 21 | <file src="build\$id$.targets" target="build" /> | 21 | <file src="$projectFolder$\build\$id$.targets" target="build" /> |
| 22 | 22 | ||
| 23 | <file src="$outputpath$$id$.dll" target="lib\net472" /> | 23 | <file src="..\x86\$id$.dll" target="lib\net472" /> |
| 24 | <file src="$outputpath$$id$.pdb" target="lib\net472" /> | 24 | <file src="..\x86\$id$.pdb" target="lib\net472" /> |
| 25 | </files> | 25 | </files> |
| 26 | </package> | 26 | </package> |
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj index aefdb4fb..d030f67b 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj +++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj | |||
| @@ -1,12 +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 | 3 | ||
| 4 | |||
| 5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 6 | <Import Project="build\WixBuildTools.TestSupport.Native.props" /> | 5 | <Import Project="build\WixBuildTools.TestSupport.Native.props" /> |
| 7 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> | 6 | |
| 8 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | ||
| 9 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | ||
| 10 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
| 11 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|Win32"> |
| 12 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
| @@ -17,6 +14,7 @@ | |||
| 17 | <Platform>Win32</Platform> | 14 | <Platform>Win32</Platform> |
| 18 | </ProjectConfiguration> | 15 | </ProjectConfiguration> |
| 19 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | |||
| 20 | <PropertyGroup Label="Globals"> | 18 | <PropertyGroup Label="Globals"> |
| 21 | <ProjectTypes>{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> | 19 | <ProjectTypes>{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> |
| 22 | <ProjectGuid>{95BABD97-FBDB-453A-AF8A-FA031A07B599}</ProjectGuid> | 20 | <ProjectGuid>{95BABD97-FBDB-453A-AF8A-FA031A07B599}</ProjectGuid> |
| @@ -26,21 +24,17 @@ | |||
| 26 | <CharacterSet>Unicode</CharacterSet> | 24 | <CharacterSet>Unicode</CharacterSet> |
| 27 | <CLRSupport>true</CLRSupport> | 25 | <CLRSupport>true</CLRSupport> |
| 28 | <Description>WixBuildTools C++/CLI Test Support</Description> | 26 | <Description>WixBuildTools C++/CLI Test Support</Description> |
| 27 | <SignOutput>false</SignOutput> | ||
| 29 | </PropertyGroup> | 28 | </PropertyGroup> |
| 29 | |||
| 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 31 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 31 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 32 | <ImportGroup Label="Shared"> | 32 | |
| 33 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" /> | ||
| 34 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" /> | ||
| 35 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" /> | ||
| 36 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
| 37 | </ImportGroup> | ||
| 38 | <PropertyGroup> | 33 | <PropertyGroup> |
| 39 | <ProjectAdditionalIncludeDirectories> | 34 | <ProjectAdditionalIncludeDirectories></ProjectAdditionalIncludeDirectories> |
| 40 | </ProjectAdditionalIncludeDirectories> | 35 | <ProjectAdditionalLinkLibraries></ProjectAdditionalLinkLibraries> |
| 41 | <ProjectAdditionalLinkLibraries> | ||
| 42 | </ProjectAdditionalLinkLibraries> | ||
| 43 | </PropertyGroup> | 36 | </PropertyGroup> |
| 37 | |||
| 44 | <ItemGroup> | 38 | <ItemGroup> |
| 45 | <ClCompile Include="AssemblyInfo.cpp" /> | 39 | <ClCompile Include="AssemblyInfo.cpp" /> |
| 46 | <ClCompile Include="precomp.cpp"> | 40 | <ClCompile Include="precomp.cpp"> |
| @@ -49,37 +43,22 @@ | |||
| 49 | <DisableSpecificWarnings>4564;4691</DisableSpecificWarnings> | 43 | <DisableSpecificWarnings>4564;4691</DisableSpecificWarnings> |
| 50 | </ClCompile> | 44 | </ClCompile> |
| 51 | </ItemGroup> | 45 | </ItemGroup> |
| 46 | |||
| 52 | <ItemGroup> | 47 | <ItemGroup> |
| 53 | <ClInclude Include="precomp.h" /> | 48 | <ClInclude Include="precomp.h" /> |
| 54 | <ClInclude Include="NativeAssert.h" /> | 49 | <ClInclude Include="NativeAssert.h" /> |
| 55 | </ItemGroup> | 50 | </ItemGroup> |
| 51 | |||
| 56 | <ItemGroup> | 52 | <ItemGroup> |
| 57 | <None Include="packages.config" /> | 53 | <None Include="packages.config" /> |
| 58 | </ItemGroup> | 54 | </ItemGroup> |
| 59 | <ItemGroup> | 55 | |
| 60 | <Reference Include="System" /> | ||
| 61 | <Reference Include="System.Core" /> | ||
| 62 | </ItemGroup> | ||
| 63 | <ItemGroup> | 56 | <ItemGroup> |
| 64 | <ProjectReference Include="..\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj"> | 57 | <ProjectReference Include="..\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj"> |
| 65 | <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project> | 58 | <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project> |
| 66 | </ProjectReference> | 59 | </ProjectReference> |
| 67 | </ItemGroup> | 60 | </ItemGroup> |
| 61 | |||
| 68 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 62 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 69 | <Import Project="build\WixBuildTools.TestSupport.Native.targets" /> | 63 | <Import Project="build\WixBuildTools.TestSupport.Native.targets" /> |
| 70 | <Target Name="PackNativeNuget" DependsOnTargets="Build"> | 64 | </Project> |
| 71 | <Exec Command='nuget pack $(MSBuildThisFileName).nuspec -OutputDirectory "$(OutputPath).." -Properties Id=$(MSBuildThisFileName);Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);OutputPath=$(OutputPath)' /> | ||
| 72 | </Target> | ||
| 73 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | ||
| 74 | <PropertyGroup> | ||
| 75 | <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> | ||
| 76 | </PropertyGroup> | ||
| 77 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" /> | ||
| 78 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" /> | ||
| 79 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" /> | ||
| 80 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" /> | ||
| 81 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> | ||
| 82 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | ||
| 83 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 84 | </Target> | ||
| 85 | </Project> \ No newline at end of file | ||
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props index 4a7a0035..e6b5997f 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props +++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props | |||
| @@ -1,10 +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 | 3 | ||
| 4 | |||
| 5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 6 | <PropertyGroup> | 5 | <PropertyGroup> |
| 7 | <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), version.json))</RepoRootDir> | 6 | <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir> |
| 8 | </PropertyGroup> | 7 | </PropertyGroup> |
| 9 | <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" /> | 8 | <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" /> |
| 10 | <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" /> | 9 | <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" /> |
| @@ -12,18 +11,4 @@ | |||
| 12 | <PlatformToolset>v142</PlatformToolset> | 11 | <PlatformToolset>v142</PlatformToolset> |
| 13 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | 12 | <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
| 14 | </PropertyGroup> | 13 | </PropertyGroup> |
| 15 | <ItemGroup> | 14 | </Project> |
| 16 | <Reference Include="xunit.abstractions"> | ||
| 17 | <HintPath>$(RepoRootDir)\packages\xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath> | ||
| 18 | </Reference> | ||
| 19 | <Reference Include="xunit.assert"> | ||
| 20 | <HintPath>$(RepoRootDir)\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath> | ||
| 21 | </Reference> | ||
| 22 | <Reference Include="xunit.core"> | ||
| 23 | <HintPath>$(RepoRootDir)\packages\xunit.extensibility.core.2.4.1\lib\netstandard1.1\xunit.core.dll</HintPath> | ||
| 24 | </Reference> | ||
| 25 | <Reference Include="xunit.execution.desktop"> | ||
| 26 | <HintPath>$(RepoRootDir)\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath> | ||
| 27 | </Reference> | ||
| 28 | </ItemGroup> | ||
| 29 | </Project> \ No newline at end of file | ||
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets index 77e72e95..cd710cca 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets +++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets | |||
| @@ -1,19 +1,49 @@ | |||
| 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 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 5 | <ItemGroup> | ||
| 6 | <Reference Include="System" /> | ||
| 7 | <Reference Include="System.Core" /> | ||
| 8 | </ItemGroup> | ||
| 4 | 9 | ||
| 5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 10 | <!-- Include these references only when not referenced by the WixBuildTools.TestSupport.Native.vcxproj --> |
| 6 | <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets')" /> | 11 | <ItemGroup Condition="'$(MSBuildProjectName)'!='$(MSBuildThisFileName)'"> |
| 12 | <Reference Include="WixBuildTools.TestSupport"> | ||
| 13 | <HintPath>$(RootBuildFolder)internal\$(Configuration)\x86\WixBuildTools.TestSupport.dll</HintPath> | ||
| 14 | </Reference> | ||
| 15 | <Reference Include="WixBuildTools.TestSupport.Native"> | ||
| 16 | <HintPath>$(RootBuildFolder)internal\$(Configuration)\x86\WixBuildTools.TestSupport.Native.dll</HintPath> | ||
| 17 | </Reference> | ||
| 18 | </ItemGroup> | ||
| 19 | |||
| 20 | <ItemGroup> | ||
| 21 | <Reference Include="xunit.abstractions"> | ||
| 22 | <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath> | ||
| 23 | </Reference> | ||
| 24 | <Reference Include="xunit.assert"> | ||
| 25 | <HintPath>$(RootPackagesFolder)xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath> | ||
| 26 | </Reference> | ||
| 27 | <Reference Include="xunit.core"> | ||
| 28 | <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.4.1\lib\netstandard1.1\xunit.core.dll</HintPath> | ||
| 29 | </Reference> | ||
| 30 | <Reference Include="xunit.execution.desktop"> | ||
| 31 | <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath> | ||
| 32 | </Reference> | ||
| 33 | </ItemGroup> | ||
| 34 | |||
| 35 | <Import Project="$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets')" /> | ||
| 7 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 36 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
| 8 | <PropertyGroup> | 37 | <PropertyGroup> |
| 9 | <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> | 38 | <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> |
| 10 | </PropertyGroup> | 39 | </PropertyGroup> |
| 11 | <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props'))" /> | 40 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.props'))" /> |
| 12 | <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets'))" /> | 41 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets'))" /> |
| 13 | <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" /> | 42 | <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" /> |
| 14 | </Target> | 43 | </Target> |
| 15 | <UsingTask AssemblyFile="$(RepoRootDir)\packages\xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" /> | 44 | |
| 45 | <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" /> | ||
| 16 | <Target Name="Test" DependsOnTargets="Build"> | 46 | <Target Name="Test" DependsOnTargets="Build"> |
| 17 | <xunit Assemblies="$(TargetPath)" /> | 47 | <xunit Assemblies="$(TargetPath)" /> |
| 18 | </Target> | 48 | </Target> |
| 19 | </Project> \ No newline at end of file | 49 | </Project> |
diff --git a/src/internal/WixBuildTools.TestSupport.Native/packages.config b/src/internal/WixBuildTools.TestSupport.Native/packages.config index 917d7a63..2423502c 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/packages.config +++ b/src/internal/WixBuildTools.TestSupport.Native/packages.config | |||
| @@ -1,12 +1,11 @@ | |||
| 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 | |||
| 5 | <packages> | 4 | <packages> |
| 6 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | 5 | <!-- |
| 7 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | 6 | Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets |
| 8 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | 7 | when any of these versions are updated. |
| 9 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | 8 | --> |
| 10 | <package id="xunit.abstractions" version="2.0.3" /> | 9 | <package id="xunit.abstractions" version="2.0.3" /> |
| 11 | <package id="xunit.assert" version="2.4.1" /> | 10 | <package id="xunit.assert" version="2.4.1" /> |
| 12 | <package id="xunit.core" version="2.4.1" /> | 11 | <package id="xunit.core" version="2.4.1" /> |
| @@ -14,4 +13,4 @@ | |||
| 14 | <package id="xunit.extensibility.execution" version="2.4.1" /> | 13 | <package id="xunit.extensibility.execution" version="2.4.1" /> |
| 15 | <package id="xunit.runner.msbuild" version="2.4.1" /> | 14 | <package id="xunit.runner.msbuild" version="2.4.1" /> |
| 16 | <package id="xunit.runner.visualstudio" version="2.4.1" /> | 15 | <package id="xunit.runner.visualstudio" version="2.4.1" /> |
| 17 | </packages> \ No newline at end of file | 16 | </packages> |
diff --git a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj index f59e5eca..01166782 100644 --- a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj +++ b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj | |||
| @@ -10,22 +10,17 @@ | |||
| 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 11 | <CreateDocumentationFile>true</CreateDocumentationFile> | 11 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 12 | <NoWarn>CS1591</NoWarn> | 12 | <NoWarn>CS1591</NoWarn> |
| 13 | <SignOutput>false</SignOutput> | ||
| 13 | </PropertyGroup> | 14 | </PropertyGroup> |
| 14 | 15 | ||
| 15 | <ItemGroup> | 16 | <ItemGroup> |
| 16 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" /> | 17 | <PackageReference Include="Microsoft.Build.Tasks.Core" /> |
| 17 | <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" /> | 18 | <PackageReference Include="WixToolset.Dtf.WindowsInstaller" /> |
| 18 | <PackageReference Include="WixToolset.Dtf.Compression" Version="4.0.*" /> | 19 | <PackageReference Include="WixToolset.Dtf.Compression" /> |
| 19 | <PackageReference Include="WixToolset.Dtf.Compression.Cab" Version="4.0.*" /> | 20 | <PackageReference Include="WixToolset.Dtf.Compression.Cab" /> |
| 20 | </ItemGroup> | 21 | </ItemGroup> |
| 21 | 22 | ||
| 22 | <ItemGroup> | 23 | <ItemGroup> |
| 23 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 24 | <PackageReference Include="xunit.assert" /> |
| 24 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <PackageReference Include="xunit.assert" Version="2.4.1" /> | ||
| 29 | </ItemGroup> | ||
| 30 | |||
| 31 | </Project> | 26 | </Project> |
diff --git a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj index 2e3a0382..65a65bd0 100644 --- a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj +++ b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
| 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 12 | <NoWarn>CS0618</NoWarn> | 12 | <NoWarn>CS0618</NoWarn> |
| 13 | <SignOutput>false</SignOutput> | ||
| 13 | </PropertyGroup> | 14 | </PropertyGroup> |
| 14 | 15 | ||
| 15 | <ItemGroup> | 16 | <ItemGroup> |
| @@ -22,7 +23,6 @@ | |||
| 22 | 23 | ||
| 23 | <ItemGroup> | 24 | <ItemGroup> |
| 24 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 25 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> |
| 25 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 26 | <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" /> |
| 26 | </ItemGroup> | 27 | </ItemGroup> |
| 27 | |||
| 28 | </Project> | 28 | </Project> |
diff --git a/src/internal/WixBuildTools.sln b/src/internal/WixBuildTools.sln deleted file mode 100644 index 689832fb..00000000 --- a/src/internal/WixBuildTools.sln +++ /dev/null | |||
| @@ -1,81 +0,0 @@ | |||
| 1 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 2 | # Visual Studio 15 | ||
| 3 | VisualStudioVersion = 15.0.27130.2003 | ||
| 4 | MinimumVisualStudioVersion = 15.0.26124.0 | ||
| 5 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.XsdGen", "src\WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj", "{E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}" | ||
| 6 | EndProject | ||
| 7 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.MsgGen", "src\WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj", "{DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}" | ||
| 8 | EndProject | ||
| 9 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.TestSupport", "src\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj", "{6C57EF2C-979A-4106-A9E5-FE342810619A}" | ||
| 10 | EndProject | ||
| 11 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixBuildTools.TestSupport.Native", "src\WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}" | ||
| 12 | EndProject | ||
| 13 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F6660B22-092F-4BC5-A303-E6F696C31E1B}" | ||
| 14 | ProjectSection(SolutionItems) = preProject | ||
| 15 | .editorconfig = .editorconfig | ||
| 16 | EndProjectSection | ||
| 17 | EndProject | ||
| 18 | Global | ||
| 19 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 20 | Debug|Any CPU = Debug|Any CPU | ||
| 21 | Debug|x64 = Debug|x64 | ||
| 22 | Debug|x86 = Debug|x86 | ||
| 23 | Release|Any CPU = Release|Any CPU | ||
| 24 | Release|x64 = Release|x64 | ||
| 25 | Release|x86 = Release|x86 | ||
| 26 | EndGlobalSection | ||
| 27 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 28 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 29 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 30 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 31 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 32 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 33 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 34 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 35 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 36 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 37 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x64.Build.0 = Release|Any CPU | ||
| 38 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 39 | {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x86.Build.0 = Release|Any CPU | ||
| 40 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 41 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 42 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 43 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 44 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 45 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 46 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 47 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 48 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 49 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x64.Build.0 = Release|Any CPU | ||
| 50 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 51 | {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x86.Build.0 = Release|Any CPU | ||
| 52 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 53 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 54 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 55 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 56 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 57 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 58 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 59 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 60 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 61 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x64.Build.0 = Release|Any CPU | ||
| 62 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 63 | {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x86.Build.0 = Release|Any CPU | ||
| 64 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 65 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
| 66 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32 | ||
| 67 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 68 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|Win32 | ||
| 69 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 70 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.Build.0 = Release|Win32 | ||
| 71 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32 | ||
| 72 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32 | ||
| 73 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.Build.0 = Release|Win32 | ||
| 74 | EndGlobalSection | ||
| 75 | GlobalSection(SolutionProperties) = preSolution | ||
| 76 | HideSolutionNode = FALSE | ||
| 77 | EndGlobalSection | ||
| 78 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 79 | SolutionGuid = {83E9E075-B440-471A-9C37-9D84BA0AE3E0} | ||
| 80 | EndGlobalSection | ||
| 81 | EndGlobal | ||
diff --git a/src/internal/WixBuildTools.v3.ncrunchsolution b/src/internal/WixBuildTools.v3.ncrunchsolution deleted file mode 100644 index 10420ac9..00000000 --- a/src/internal/WixBuildTools.v3.ncrunchsolution +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | <SolutionConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <AllowParallelTestExecution>True</AllowParallelTestExecution> | ||
| 4 | <SolutionConfigured>True</SolutionConfigured> | ||
| 5 | </Settings> | ||
| 6 | </SolutionConfiguration> \ No newline at end of file | ||
diff --git a/src/internal/appveyor.cmd b/src/internal/appveyor.cmd deleted file mode 100644 index 9fa5e330..00000000 --- a/src/internal/appveyor.cmd +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | nuget restore || exit /b | ||
| 5 | |||
| 6 | dotnet pack -c Release src\WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b | ||
| 7 | dotnet pack -c Release src\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj || exit /b | ||
| 8 | dotnet pack -c Release src\WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b | ||
| 9 | |||
| 10 | msbuild -p:Configuration=Release -t:PackNativeNuget src\WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj || exit /b | ||
| 11 | |||
| 12 | @popd | ||
| 13 | @endlocal \ No newline at end of file | ||
diff --git a/src/internal/appveyor.yml b/src/internal/appveyor.yml deleted file mode 100644 index 522e5af3..00000000 --- a/src/internal/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/internal/internal.cmd b/src/internal/internal.cmd new file mode 100644 index 00000000..bd0e4738 --- /dev/null +++ b/src/internal/internal.cmd | |||
| @@ -0,0 +1,23 @@ | |||
| 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 internal %_C% | ||
| 10 | |||
| 11 | :: internal | ||
| 12 | |||
| 13 | nuget restore || exit /b | ||
| 14 | |||
| 15 | :: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b | ||
| 16 | :: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b | ||
| 17 | |||
| 18 | msbuild -t:Pack -p:Configuration=%_C% WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj || exit /b | ||
| 19 | |||
| 20 | msbuild -t:Build -p:Configuration=%_C% WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj || exit /b | ||
| 21 | |||
| 22 | @popd | ||
| 23 | @endlocal | ||
diff --git a/src/internal/internal.sln b/src/internal/internal.sln new file mode 100644 index 00000000..ae53cc53 --- /dev/null +++ b/src/internal/internal.sln | |||
| @@ -0,0 +1,55 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 16 | ||
| 4 | VisualStudioVersion = 16.6.30114.105 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.TestSupport", "WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj", "{8E082709-7355-41D5-AF86-6BBF9C89BDD7}" | ||
| 7 | EndProject | ||
| 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixBuildTools.TestSupport.Native", "WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}" | ||
| 9 | EndProject | ||
| 10 | Global | ||
| 11 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 12 | Debug|Any CPU = Debug|Any CPU | ||
| 13 | Debug|ARM64 = Debug|ARM64 | ||
| 14 | Debug|x64 = Debug|x64 | ||
| 15 | Debug|x86 = Debug|x86 | ||
| 16 | Release|Any CPU = Release|Any CPU | ||
| 17 | Release|ARM64 = Release|ARM64 | ||
| 18 | Release|x64 = Release|x64 | ||
| 19 | Release|x86 = Release|x86 | ||
| 20 | EndGlobalSection | ||
| 21 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 22 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 23 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 24 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 25 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 26 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 27 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 28 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 29 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 30 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 31 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 32 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 33 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 34 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 35 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x64.Build.0 = Release|Any CPU | ||
| 36 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 37 | {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.Build.0 = Release|Any CPU | ||
| 38 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 39 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|ARM64.ActiveCfg = Debug|Win32 | ||
| 40 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32 | ||
| 41 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 42 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|Win32 | ||
| 43 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 44 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|ARM64.ActiveCfg = Release|Win32 | ||
| 45 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32 | ||
| 46 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32 | ||
| 47 | {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.Build.0 = Release|Win32 | ||
| 48 | EndGlobalSection | ||
| 49 | GlobalSection(SolutionProperties) = preSolution | ||
| 50 | HideSolutionNode = FALSE | ||
| 51 | EndGlobalSection | ||
| 52 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 53 | SolutionGuid = {CCBE86BA-6E38-4A97-8AAD-AA2972350544} | ||
| 54 | EndGlobalSection | ||
| 55 | EndGlobal | ||
diff --git a/src/internal/nuget.config b/src/internal/nuget.config deleted file mode 100644 index fcbac27a..00000000 --- a/src/internal/nuget.config +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 6 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 7 | </packageSources> | ||
| 8 | </configuration> \ No newline at end of file | ||
diff --git a/src/wix/Custom.Build.props b/src/libs/Directory.Build.props index 889fb62e..ea9ad0e7 100644 --- a/src/wix/Custom.Build.props +++ b/src/libs/Directory.Build.props | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 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 | <!-- 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 | |||
| 2 | <Project> | 4 | <Project> |
| 3 | <PropertyGroup Condition="'$(Configuration)'=='Release'"> | 5 | <PropertyGroup> |
| 4 | <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | 6 | <SegmentName>libs</SegmentName> |
| 5 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | |||
| 9 | <Import Project="..\Directory.Build.props" /> | ||
| 6 | </Project> | 10 | </Project> |
diff --git a/src/libs/dutil/Directory.Build.props b/src/libs/dutil/Directory.Build.props deleted file mode 100644 index fb34d54e..00000000 --- a/src/libs/dutil/Directory.Build.props +++ /dev/null | |||
| @@ -1,26 +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.props | ||
| 5 | then update all of the repos. | ||
| 6 | --> | ||
| 7 | <Project> | ||
| 8 | <PropertyGroup> | ||
| 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | ||
| 11 | |||
| 12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | ||
| 13 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | ||
| 14 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | ||
| 15 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | ||
| 16 | |||
| 17 | <Authors>WiX Toolset Team</Authors> | ||
| 18 | <Company>WiX Toolset</Company> | ||
| 19 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | ||
| 20 | <PackageLicenseExpression>MS-RL</PackageLicenseExpression> | ||
| 21 | <Product>WiX Toolset</Product> | ||
| 22 | </PropertyGroup> | ||
| 23 | |||
| 24 | <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | ||
| 25 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 26 | </Project> | ||
diff --git a/src/libs/dutil/Directory.Build.targets b/src/libs/dutil/Directory.Build.targets deleted file mode 100644 index 44701fb6..00000000 --- a/src/libs/dutil/Directory.Build.targets +++ /dev/null | |||
| @@ -1,73 +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 | <Project> | ||
| 8 | <PropertyGroup> | ||
| 9 | <SigningToolFolder>$(BaseOutputPath)obj\.tools</SigningToolFolder> | ||
| 10 | <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe> | ||
| 11 | <SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist> | ||
| 12 | <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration> | ||
| 13 | </PropertyGroup> | ||
| 14 | |||
| 15 | <PropertyGroup> | ||
| 16 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 17 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 18 | </PropertyGroup> | ||
| 19 | |||
| 20 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 21 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 22 | <PropertyGroup> | ||
| 23 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 24 | |||
| 25 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 26 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(MSBuildProjectDirectory)</NuspecBasePath> | ||
| 27 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors="$(Authors)";Configuration=$(Configuration);Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"</NuspecProperties> | ||
| 28 | <NuspecProperties>$(NuspecProperties);Version=$(NPMPackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 29 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 30 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 31 | </PropertyGroup> | ||
| 32 | </Target> | ||
| 33 | |||
| 34 | <Target Name="PackNative" DependsOnTargets="GetBuildVersion;SetNuspecProperties" | ||
| 35 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 36 | |||
| 37 | <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(BaseOutputPath)$(Configuration)" -BasePath "$(NuspecBasePath)" -Properties $(NuspecProperties)' | ||
| 38 | WorkingDirectory="$(MSBuildProjectDirectory)" /> | ||
| 39 | |||
| 40 | <ItemGroup> | ||
| 41 | <NuGetPackOutput Include="$(BaseOutputPath)$(Configuration)\**\$(PackageId)*.nupkg" /> | ||
| 42 | </ItemGroup> | ||
| 43 | </Target> | ||
| 44 | |||
| 45 | <Target Name="_GetSignClient" | ||
| 46 | Condition=" !Exists('$(SigningToolExe)') "> | ||
| 47 | |||
| 48 | <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' /> | ||
| 49 | |||
| 50 | <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' /> | ||
| 51 | </Target> | ||
| 52 | |||
| 53 | <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild" | ||
| 54 | Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and | ||
| 55 | ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))"> | ||
| 56 | |||
| 57 | <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | ||
| 58 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
| 59 | </Target> | ||
| 60 | |||
| 61 | <Target Name="SignNupkg" DependsOnTargets="_GetSignClient" AfterTargets="Pack;PackNative" | ||
| 62 | Condition=" '$(SigningUser)'!='' and '@(NuGetPackOutput)'!='' and '$(SignNupkg)'!='false' "> | ||
| 63 | <ItemGroup> | ||
| 64 | <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " /> | ||
| 65 | </ItemGroup> | ||
| 66 | |||
| 67 | <Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->'%(Identity)')" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | ||
| 68 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
| 69 | </Target> | ||
| 70 | |||
| 71 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 72 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 73 | </Project> | ||
diff --git a/src/libs/dutil/Directory.csproj.props b/src/libs/dutil/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/libs/dutil/Directory.csproj.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/libs/dutil/Directory.vcxproj.props b/src/libs/dutil/Directory.vcxproj.props deleted file mode 100644 index 9ea7071b..00000000 --- a/src/libs/dutil/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,115 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <PropertyGroup> | ||
| 23 | <CodeAnalysisRuleSet Condition=" Exists('$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset') ">$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> | ||
| 24 | </PropertyGroup> | ||
| 25 | |||
| 26 | <ItemDefinitionGroup> | ||
| 27 | <ClCompile> | ||
| 28 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 29 | <WarningLevel>Level4</WarningLevel> | ||
| 30 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 31 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 32 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 33 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 34 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 35 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 36 | <ExceptionHandling>false</ExceptionHandling> | ||
| 37 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 38 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 39 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 40 | </ClCompile> | ||
| 41 | <ResourceCompile> | ||
| 42 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 43 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 44 | </ResourceCompile> | ||
| 45 | <Lib> | ||
| 46 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 47 | </Lib> | ||
| 48 | <Link> | ||
| 49 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 50 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 51 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 52 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 53 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 54 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 55 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 56 | </Link> | ||
| 57 | </ItemDefinitionGroup> | ||
| 58 | |||
| 59 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 60 | <ClCompile> | ||
| 61 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 62 | </ClCompile> | ||
| 63 | </ItemDefinitionGroup> | ||
| 64 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 65 | <ClCompile> | ||
| 66 | <CallingConvention>CDecl</CallingConvention> | ||
| 67 | </ClCompile> | ||
| 68 | </ItemDefinitionGroup> | ||
| 69 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 70 | <ClCompile> | ||
| 71 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 72 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 73 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 74 | </ClCompile> | ||
| 75 | </ItemDefinitionGroup> | ||
| 76 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 77 | <ClCompile> | ||
| 78 | <Optimization>Disabled</Optimization> | ||
| 79 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 80 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 81 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 82 | </ClCompile> | ||
| 83 | </ItemDefinitionGroup> | ||
| 84 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | ||
| 85 | <ClCompile> | ||
| 86 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 87 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | ||
| 88 | </ClCompile> | ||
| 89 | </ItemDefinitionGroup> | ||
| 90 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 91 | <ClCompile> | ||
| 92 | <Optimization>MinSpace</Optimization> | ||
| 93 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 94 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 95 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 96 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 97 | </ClCompile> | ||
| 98 | <Link> | ||
| 99 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 100 | <OptimizeReferences>true</OptimizeReferences> | ||
| 101 | </Link> | ||
| 102 | </ItemDefinitionGroup> | ||
| 103 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | ||
| 104 | <ClCompile> | ||
| 105 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 106 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | ||
| 107 | </ClCompile> | ||
| 108 | </ItemDefinitionGroup> | ||
| 109 | <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' "> | ||
| 110 | <Link> | ||
| 111 | <KeyFile>$(LinkKeyFile)</KeyFile> | ||
| 112 | <DelaySign>$(LinkDelaySign)</DelaySign> | ||
| 113 | </Link> | ||
| 114 | </ItemDefinitionGroup> | ||
| 115 | </Project> | ||
diff --git a/src/libs/dutil/NativeMultiTargeting.Build.props b/src/libs/dutil/NativeMultiTargeting.Build.props deleted file mode 100644 index 1ff46559..00000000 --- a/src/libs/dutil/NativeMultiTargeting.Build.props +++ /dev/null | |||
| @@ -1,10 +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 | <!-- Overrides the standard Cpp.Build.props to include the PlatformToolset in the output path. --> | ||
| 6 | <PropertyGroup> | ||
| 7 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\</IntDir> | ||
| 8 | <OutDir>$(OutputPath)$(PlatformToolset)\$(PlatformTarget)\</OutDir> | ||
| 9 | </PropertyGroup> | ||
| 10 | </Project> | ||
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec index 3499a2d5..fef60013 100644 --- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec +++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec | |||
| @@ -1,27 +1,28 @@ | |||
| 1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
| 2 | <package > | 2 | <package > |
| 3 | <metadata> | 3 | <metadata minClientVersion="4.0"> |
| 4 | <id>$id$</id> | 4 | <id>$id$</id> |
| 5 | <version>$version$</version> | 5 | <version>$version$</version> |
| 6 | <title>$title$</title> | ||
| 7 | <description>$description$</description> | ||
| 6 | <authors>$authors$</authors> | 8 | <authors>$authors$</authors> |
| 7 | <owners>$authors$</owners> | ||
| 8 | <license type="expression">MS-RL</license> | 9 | <license type="expression">MS-RL</license> |
| 9 | <projectUrl>https://github.com/wixtoolset/dutil</projectUrl> | ||
| 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
| 11 | <description>$description$</description> | ||
| 12 | <copyright>$copyright$</copyright> | 11 | <copyright>$copyright$</copyright> |
| 12 | <projectUrl>$projectUrl$</projectUrl> | ||
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
| 13 | </metadata> | 14 | </metadata> |
| 14 | 15 | ||
| 15 | <files> | 16 | <files> |
| 16 | <file src="build\$id$.props" target="build\" /> | 17 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
| 17 | <file src="inc\*" target="build\native\include" /> | 18 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
| 18 | <file src="..\..\build\$configuration$\v140\x64\dutil.lib" target="build\native\v140\x64" /> | 19 | <file src="..\..\v140\x64\dutil.lib" target="build\native\v140\x64" /> |
| 19 | <file src="..\..\build\$configuration$\v140\x86\dutil.lib" target="build\native\v140\x86" /> | 20 | <file src="..\..\v140\x86\dutil.lib" target="build\native\v140\x86" /> |
| 20 | <file src="..\..\build\$configuration$\v141\x64\dutil.lib" target="build\native\v141\x64" /> | 21 | <file src="..\..\v141\x64\dutil.lib" target="build\native\v141\x64" /> |
| 21 | <file src="..\..\build\$configuration$\v141\x86\dutil.lib" target="build\native\v141\x86" /> | 22 | <file src="..\..\v141\x86\dutil.lib" target="build\native\v141\x86" /> |
| 22 | <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" /> | 23 | <file src="..\..\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" /> |
| 23 | <file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" /> | 24 | <file src="..\..\v142\x64\dutil.lib" target="build\native\v142\x64" /> |
| 24 | <file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" /> | 25 | <file src="..\..\v142\x86\dutil.lib" target="build\native\v142\x86" /> |
| 25 | <file src="..\..\build\$configuration$\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" /> | 26 | <file src="..\..\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" /> |
| 26 | </files> | 27 | </files> |
| 27 | </package> | 28 | </package> |
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj index 4e341438..a02e638a 100644 --- a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj +++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 45 | 45 | ||
| 46 | <Import Project="..\NativeMultiTargeting.Build.props" /> | 46 | <Import Project="..\..\..\NativeMultiTargeting.Build.props" /> |
| 47 | 47 | ||
| 48 | <ItemGroup> | 48 | <ItemGroup> |
| 49 | <ClCompile Include="acl2util.cpp" /> | 49 | <ClCompile Include="acl2util.cpp" /> |
| @@ -170,13 +170,12 @@ | |||
| 170 | </ItemGroup> | 170 | </ItemGroup> |
| 171 | 171 | ||
| 172 | <ItemGroup> | 172 | <ItemGroup> |
| 173 | <None Include="packages.config" /> | ||
| 174 | <None Include="xsd\thmutil.xsd" /> | 173 | <None Include="xsd\thmutil.xsd" /> |
| 175 | </ItemGroup> | 174 | </ItemGroup> |
| 176 | 175 | ||
| 177 | <ItemGroup> | 176 | <ItemGroup> |
| 178 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 177 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 179 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 178 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
| 180 | </ItemGroup> | 179 | </ItemGroup> |
| 181 | 180 | ||
| 182 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 181 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
diff --git a/src/libs/dutil/WixToolset.DUtil/packages.config b/src/libs/dutil/WixToolset.DUtil/packages.config deleted file mode 100644 index 5bbcd994..00000000 --- a/src/libs/dutil/WixToolset.DUtil/packages.config +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 7 | </packages> \ No newline at end of file | ||
diff --git a/src/libs/dutil/appveyor.cmd b/src/libs/dutil/appveyor.cmd deleted file mode 100644 index 85476b8e..00000000 --- a/src/libs/dutil/appveyor.cmd +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | nuget restore || exit /b | ||
| 7 | |||
| 8 | msbuild -t:Test -p:Configuration=%_C% src\test\DUtilUnitTest || exit /b | ||
| 9 | |||
| 10 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 || exit /b | ||
| 11 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 || exit /b | ||
| 12 | |||
| 13 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 || exit /b | ||
| 14 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 || exit /b | ||
| 15 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b | ||
| 16 | |||
| 17 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 || exit /b | ||
| 18 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b | ||
| 19 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b | ||
| 20 | |||
| 21 | msbuild -p:Configuration=%_C% -t:PackNative src\dutil\dutil.vcxproj || exit /b | ||
| 22 | |||
| 23 | @popd | ||
| 24 | @endlocal \ No newline at end of file | ||
diff --git a/src/libs/dutil/appveyor.yml b/src/libs/dutil/appveyor.yml deleted file mode 100644 index f602d07c..00000000 --- a/src/libs/dutil/appveyor.yml +++ /dev/null | |||
| @@ -1,44 +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 | test: off | ||
| 25 | |||
| 26 | pull_requests: | ||
| 27 | do_not_increment_build_number: true | ||
| 28 | |||
| 29 | nuget: | ||
| 30 | disable_publish_on_pr: true | ||
| 31 | |||
| 32 | skip_branch_with_pr: true | ||
| 33 | skip_tags: true | ||
| 34 | |||
| 35 | artifacts: | ||
| 36 | - path: build\Release\**\*.nupkg | ||
| 37 | name: nuget | ||
| 38 | - path: build\Release\**\*.msi | ||
| 39 | name: msi | ||
| 40 | |||
| 41 | notifications: | ||
| 42 | - provider: Slack | ||
| 43 | incoming_webhook: | ||
| 44 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/libs/dutil/dutil.sln b/src/libs/dutil/dutil.sln index 433f42a5..f6bfcc97 100644 --- a/src/libs/dutil/dutil.sln +++ b/src/libs/dutil/dutil.sln | |||
| @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.30711.63 | 4 | VisualStudioVersion = 16.0.30711.63 |
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dutil", "src\dutil\dutil.vcxproj", "{1244E671-F108-4334-BA52-8A7517F26ECD}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dutil", "WixToolset.DUtil\dutil.vcxproj", "{1244E671-F108-4334-BA52-8A7517F26ECD}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DUtilUnitTest", "src\test\DUtilUnitTest\DUtilUnitTest.vcxproj", "{AB7EE608-E5FB-42A5-831F-0DEEEA141223}" | 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DUtilUnitTest", "test\DUtilUnitTest\DUtilUnitTest.vcxproj", "{AB7EE608-E5FB-42A5-831F-0DEEEA141223}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Global | 10 | Global |
| 11 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 11 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/libs/dutil/nuget.config b/src/libs/dutil/nuget.config deleted file mode 100644 index d5ef8952..00000000 --- a/src/libs/dutil/nuget.config +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 6 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 7 | </packageSources> | ||
| 8 | </configuration> \ No newline at end of file | ||
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj index 18410e5d..cd8d16c4 100644 --- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj +++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj | |||
| @@ -2,7 +2,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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" /> | 5 | <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" /> |
| 6 | |||
| 6 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
| 7 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|Win32"> |
| 8 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
| @@ -29,7 +30,7 @@ | |||
| 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 30 | 31 | ||
| 31 | <PropertyGroup> | 32 | <PropertyGroup> |
| 32 | <ProjectAdditionalIncludeDirectories>..\..\dutil\inc</ProjectAdditionalIncludeDirectories> | 33 | <ProjectAdditionalIncludeDirectories>..\..\WixToolset.DUtil\inc</ProjectAdditionalIncludeDirectories> |
| 33 | <ProjectAdditionalLinkLibraries>rpcrt4.lib;Mpr.lib;Ws2_32.lib;urlmon.lib;wininet.lib</ProjectAdditionalLinkLibraries> | 34 | <ProjectAdditionalLinkLibraries>rpcrt4.lib;Mpr.lib;Ws2_32.lib;urlmon.lib;wininet.lib</ProjectAdditionalLinkLibraries> |
| 34 | </PropertyGroup> | 35 | </PropertyGroup> |
| 35 | 36 | ||
| @@ -63,7 +64,6 @@ | |||
| 63 | </ItemGroup> | 64 | </ItemGroup> |
| 64 | 65 | ||
| 65 | <ItemGroup> | 66 | <ItemGroup> |
| 66 | <None Include="packages.config" /> | ||
| 67 | <ResourceCompile Include="UnitTest.rc" /> | 67 | <ResourceCompile Include="UnitTest.rc" /> |
| 68 | </ItemGroup> | 68 | </ItemGroup> |
| 69 | 69 | ||
| @@ -72,28 +72,11 @@ | |||
| 72 | </ItemGroup> | 72 | </ItemGroup> |
| 73 | 73 | ||
| 74 | <ItemGroup> | 74 | <ItemGroup> |
| 75 | <Reference Include="System" /> | 75 | <ProjectReference Include="..\..\WixToolset.DUtil\dutil.vcxproj"> |
| 76 | <Reference Include="System.Core" /> | ||
| 77 | <Reference Include="WixBuildTools.TestSupport"> | ||
| 78 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.47\lib\net472\WixBuildTools.TestSupport.dll</HintPath> | ||
| 79 | </Reference> | ||
| 80 | <Reference Include="WixBuildTools.TestSupport.Native"> | ||
| 81 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> | ||
| 82 | </Reference> | ||
| 83 | </ItemGroup> | ||
| 84 | |||
| 85 | <ItemGroup> | ||
| 86 | <ProjectReference Include="..\..\dutil\dutil.vcxproj"> | ||
| 87 | <Project>{1244E671-F108-4334-BA52-8A7517F26ECD}</Project> | 76 | <Project>{1244E671-F108-4334-BA52-8A7517F26ECD}</Project> |
| 88 | </ProjectReference> | 77 | </ProjectReference> |
| 89 | </ItemGroup> | 78 | </ItemGroup> |
| 79 | |||
| 90 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 80 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 91 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" /> | 81 | <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" /> |
| 92 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 82 | </Project> |
| 93 | <PropertyGroup> | ||
| 94 | <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> | ||
| 95 | </PropertyGroup> | ||
| 96 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props'))" /> | ||
| 97 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets'))" /> | ||
| 98 | </Target> | ||
| 99 | </Project> \ No newline at end of file | ||
diff --git a/src/libs/dutil/test/DUtilUnitTest/packages.config b/src/libs/dutil/test/DUtilUnitTest/packages.config deleted file mode 100644 index a4fef2bf..00000000 --- a/src/libs/dutil/test/DUtilUnitTest/packages.config +++ /dev/null | |||
| @@ -1,13 +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 | <packages> | ||
| 4 | <package id="xunit.abstractions" version="2.0.3" /> | ||
| 5 | <package id="xunit.assert" version="2.4.1" /> | ||
| 6 | <package id="xunit.core" version="2.4.1" /> | ||
| 7 | <package id="xunit.extensibility.core" version="2.4.1" /> | ||
| 8 | <package id="xunit.extensibility.execution" version="2.4.1" /> | ||
| 9 | <package id="xunit.runner.msbuild" version="2.4.1" /> | ||
| 10 | <package id="xunit.runner.visualstudio" version="2.4.1" /> | ||
| 11 | <package id="WixBuildTools.TestSupport" version="4.0.47" /> | ||
| 12 | <package id="WixBuildTools.TestSupport.Native" version="4.0.47" /> | ||
| 13 | </packages> \ No newline at end of file | ||
diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd new file mode 100644 index 00000000..4b3cfa09 --- /dev/null +++ b/src/libs/libs.cmd | |||
| @@ -0,0 +1,49 @@ | |||
| 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 libs %_C% using %_N% | ||
| 10 | |||
| 11 | :: libs | ||
| 12 | |||
| 13 | nuget restore || exit /b | ||
| 14 | |||
| 15 | :: dutil | ||
| 16 | |||
| 17 | msbuild -t:Test -p:Configuration=%_C% dutil\test\DUtilUnitTest || exit /b | ||
| 18 | |||
| 19 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b | ||
| 20 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b | ||
| 21 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b | ||
| 22 | |||
| 23 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b | ||
| 24 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b | ||
| 25 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b | ||
| 26 | |||
| 27 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b | ||
| 28 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b | ||
| 29 | |||
| 30 | msbuild -p:Configuration=%_C% -t:PackNative dutil\WixToolset.DUtil\dutil.vcxproj || exit /b | ||
| 31 | |||
| 32 | |||
| 33 | :: wcautil | ||
| 34 | |||
| 35 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b | ||
| 36 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b | ||
| 37 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b | ||
| 38 | |||
| 39 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b | ||
| 40 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b | ||
| 41 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b | ||
| 42 | |||
| 43 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b | ||
| 44 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b | ||
| 45 | |||
| 46 | msbuild -t:PackNative -p:Configuration=%_C% wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b | ||
| 47 | |||
| 48 | @popd | ||
| 49 | @endlocal | ||
diff --git a/src/libs/libs.sln b/src/libs/libs.sln new file mode 100644 index 00000000..e0a4a149 --- /dev/null +++ b/src/libs/libs.sln | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 16 | ||
| 4 | VisualStudioVersion = 16.6.30114.105 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dutil", "dutil\WixToolset.DUtil\dutil.vcxproj", "{1244E671-F108-4334-BA52-8A7517F26ECD}" | ||
| 7 | EndProject | ||
| 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DUtilUnitTest", "dutil\test\DUtilUnitTest\DUtilUnitTest.vcxproj", "{AB7EE608-E5FB-42A5-831F-0DEEEA141223}" | ||
| 9 | EndProject | ||
| 10 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wcautil", "wcautil\WixToolset.WcaUtil\wcautil.vcxproj", "{5B3714B6-3A76-463E-8595-D48DA276C512}" | ||
| 11 | EndProject | ||
| 12 | Global | ||
| 13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 14 | Debug|Any CPU = Debug|Any CPU | ||
| 15 | Debug|ARM64 = Debug|ARM64 | ||
| 16 | Debug|x64 = Debug|x64 | ||
| 17 | Debug|x86 = Debug|x86 | ||
| 18 | Release|Any CPU = Release|Any CPU | ||
| 19 | Release|ARM64 = Release|ARM64 | ||
| 20 | Release|x64 = Release|x64 | ||
| 21 | Release|x86 = Release|x86 | ||
| 22 | EndGlobalSection | ||
| 23 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 24 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 25 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
| 26 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
| 27 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 28 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.Build.0 = Debug|x64 | ||
| 29 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 30 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.Build.0 = Debug|Win32 | ||
| 31 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 32 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
| 33 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|ARM64.Build.0 = Release|ARM64 | ||
| 34 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.ActiveCfg = Release|x64 | ||
| 35 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.Build.0 = Release|x64 | ||
| 36 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.ActiveCfg = Release|Win32 | ||
| 37 | {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.Build.0 = Release|Win32 | ||
| 38 | {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 39 | {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|ARM64.ActiveCfg = Debug|Win32 | ||
| 40 | {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x64.ActiveCfg = Debug|Win32 | ||
| 41 | {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 42 | {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x86.Build.0 = Debug|Win32 | ||
| 43 | {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 44 | {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|ARM64.ActiveCfg = Release|Win32 | ||
| 45 | {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x64.ActiveCfg = Release|Win32 | ||
| 46 | {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x86.ActiveCfg = Release|Win32 | ||
| 47 | {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x86.Build.0 = Release|Win32 | ||
| 48 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 49 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
| 50 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
| 51 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 52 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x64.Build.0 = Debug|x64 | ||
| 53 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 54 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x86.Build.0 = Debug|Win32 | ||
| 55 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 56 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
| 57 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM64.Build.0 = Release|ARM64 | ||
| 58 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x64.ActiveCfg = Release|x64 | ||
| 59 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x64.Build.0 = Release|x64 | ||
| 60 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x86.ActiveCfg = Release|Win32 | ||
| 61 | {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x86.Build.0 = Release|Win32 | ||
| 62 | EndGlobalSection | ||
| 63 | GlobalSection(SolutionProperties) = preSolution | ||
| 64 | HideSolutionNode = FALSE | ||
| 65 | EndGlobalSection | ||
| 66 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 67 | SolutionGuid = {5A365A50-2958-4E1C-AD69-7B90F09598BC} | ||
| 68 | EndGlobalSection | ||
| 69 | EndGlobal | ||
diff --git a/src/libs/wcautil/Cpp.Build.props b/src/libs/wcautil/Cpp.Build.props deleted file mode 100644 index 44a042c7..00000000 --- a/src/libs/wcautil/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/libs/wcautil/Directory.Build.props b/src/libs/wcautil/Directory.Build.props deleted file mode 100644 index e853e22d..00000000 --- a/src/libs/wcautil/Directory.Build.props +++ /dev/null | |||
| @@ -1,26 +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.props | ||
| 5 | then update all of the repos. | ||
| 6 | --> | ||
| 7 | <Project> | ||
| 8 | <PropertyGroup> | ||
| 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | ||
| 11 | |||
| 12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | ||
| 13 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | ||
| 14 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | ||
| 15 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | ||
| 16 | |||
| 17 | <Authors>WiX Toolset Team</Authors> | ||
| 18 | <Company>WiX Toolset</Company> | ||
| 19 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | ||
| 20 | <PackageLicenseExpression>MS-RL</PackageLicenseExpression> | ||
| 21 | <Product>WiX Toolset</Product> | ||
| 22 | </PropertyGroup> | ||
| 23 | |||
| 24 | <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " /> | ||
| 25 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 26 | </Project> | ||
diff --git a/src/libs/wcautil/Directory.Build.targets b/src/libs/wcautil/Directory.Build.targets deleted file mode 100644 index dac7452a..00000000 --- a/src/libs/wcautil/Directory.Build.targets +++ /dev/null | |||
| @@ -1,48 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | </Project> | ||
diff --git a/src/libs/wcautil/NativeMultiTargeting.Build.props b/src/libs/wcautil/NativeMultiTargeting.Build.props deleted file mode 100644 index 1ff46559..00000000 --- a/src/libs/wcautil/NativeMultiTargeting.Build.props +++ /dev/null | |||
| @@ -1,10 +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 | <!-- Overrides the standard Cpp.Build.props to include the PlatformToolset in the output path. --> | ||
| 6 | <PropertyGroup> | ||
| 7 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\</IntDir> | ||
| 8 | <OutDir>$(OutputPath)$(PlatformToolset)\$(PlatformTarget)\</OutDir> | ||
| 9 | </PropertyGroup> | ||
| 10 | </Project> | ||
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/packages.config b/src/libs/wcautil/WixToolset.WcaUtil/packages.config deleted file mode 100644 index aa8b4077..00000000 --- a/src/libs/wcautil/WixToolset.WcaUtil/packages.config +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> | ||
| 4 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 5 | </packages> \ No newline at end of file | ||
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec index a57a5749..b9547a8b 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec +++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec | |||
| @@ -1,30 +1,31 @@ | |||
| 1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
| 2 | <package > | 2 | <package > |
| 3 | <metadata> | 3 | <metadata minClientVersion="4.0"> |
| 4 | <id>$id$</id> | 4 | <id>$id$</id> |
| 5 | <version>$version$</version> | 5 | <version>$version$</version> |
| 6 | <title>$title$</title> | ||
| 7 | <description>$description$</description> | ||
| 6 | <authors>$authors$</authors> | 8 | <authors>$authors$</authors> |
| 7 | <owners>$authors$</owners> | ||
| 8 | <license type="expression">MS-RL</license> | 9 | <license type="expression">MS-RL</license> |
| 9 | <projectUrl>https://github.com/wixtoolset/wcautil</projectUrl> | ||
| 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
| 11 | <description>$description$</description> | ||
| 12 | <copyright>$copyright$</copyright> | 11 | <copyright>$copyright$</copyright> |
| 12 | <projectUrl>$projectUrl$</projectUrl> | ||
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
| 13 | <dependencies> | 14 | <dependencies> |
| 14 | <dependency id="WixToolset.DUtil" version="[4,5)" /> | 15 | <dependency id="WixToolset.DUtil" version="[4,5)" /> |
| 15 | </dependencies> | 16 | </dependencies> |
| 16 | </metadata> | 17 | </metadata> |
| 17 | 18 | ||
| 18 | <files> | 19 | <files> |
| 19 | <file src="build\$id$.props" target="build\" /> | 20 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
| 20 | <file src="inc\*" target="build\native\include" /> | 21 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
| 21 | <file src="..\..\build\$configuration$\v140\x64\wcautil.lib" target="build\native\v140\x64" /> | 22 | <file src="..\..\v140\x64\wcautil.lib" target="build\native\v140\x64" /> |
| 22 | <file src="..\..\build\$configuration$\v140\x86\wcautil.lib" target="build\native\v140\x86" /> | 23 | <file src="..\..\v140\x86\wcautil.lib" target="build\native\v140\x86" /> |
| 23 | <file src="..\..\build\$configuration$\v141\x64\wcautil.lib" target="build\native\v141\x64" /> | 24 | <file src="..\..\v141\x64\wcautil.lib" target="build\native\v141\x64" /> |
| 24 | <file src="..\..\build\$configuration$\v141\x86\wcautil.lib" target="build\native\v141\x86" /> | 25 | <file src="..\..\v141\x86\wcautil.lib" target="build\native\v141\x86" /> |
| 25 | <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" /> | 26 | <file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" /> |
| 26 | <file src="..\..\build\$configuration$\v142\x64\wcautil.lib" target="build\native\v142\x64" /> | 27 | <file src="..\..\v142\x64\wcautil.lib" target="build\native\v142\x64" /> |
| 27 | <file src="..\..\build\$configuration$\v142\x86\wcautil.lib" target="build\native\v142\x86" /> | 28 | <file src="..\..\v142\x86\wcautil.lib" target="build\native\v142\x86" /> |
| 28 | <file src="..\..\build\$configuration$\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" /> | 29 | <file src="..\..\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" /> |
| 29 | </files> | 30 | </files> |
| 30 | </package> | 31 | </package> |
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj index 6876bd5b..377358ef 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj +++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | |||
| 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
| 5 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 6 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 7 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -28,6 +28,7 @@ | |||
| 28 | <Platform>x64</Platform> | 28 | <Platform>x64</Platform> |
| 29 | </ProjectConfiguration> | 29 | </ProjectConfiguration> |
| 30 | </ItemGroup> | 30 | </ItemGroup> |
| 31 | |||
| 31 | <PropertyGroup Label="Globals"> | 32 | <PropertyGroup Label="Globals"> |
| 32 | <ProjectGuid>{5B3714B6-3A76-463E-8595-D48DA276C512}</ProjectGuid> | 33 | <ProjectGuid>{5B3714B6-3A76-463E-8595-D48DA276C512}</ProjectGuid> |
| 33 | <ConfigurationType>StaticLibrary</ConfigurationType> | 34 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| @@ -36,14 +37,17 @@ | |||
| 36 | <PlatformToolset>v142</PlatformToolset> | 37 | <PlatformToolset>v142</PlatformToolset> |
| 37 | <CharacterSet>MultiByte</CharacterSet> | 38 | <CharacterSet>MultiByte</CharacterSet> |
| 38 | <Description>WiX Toolset Custom Action native utility library</Description> | 39 | <Description>WiX Toolset Custom Action native utility library</Description> |
| 40 | <PackageId>WixToolset.WcaUtil</PackageId> | ||
| 39 | </PropertyGroup> | 41 | </PropertyGroup> |
| 40 | 42 | ||
| 41 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 43 | <ImportGroup Label="Shared"> | 45 | |
| 44 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> | 46 | <Import Project="..\..\..\NativeMultiTargeting.Build.props" /> |
| 45 | </ImportGroup> | 47 | |
| 46 | <Import Project="..\NativeMultiTargeting.Build.props" /> | 48 | <PropertyGroup> |
| 49 | <ProjectAdditionalIncludeDirectories>..\..\dutil\WixToolset.DUtil\inc</ProjectAdditionalIncludeDirectories> | ||
| 50 | </PropertyGroup> | ||
| 47 | 51 | ||
| 48 | <ItemGroup> | 52 | <ItemGroup> |
| 49 | <ClCompile Include="exbinary.cpp" /> | 53 | <ClCompile Include="exbinary.cpp" /> |
| @@ -75,20 +79,9 @@ | |||
| 75 | </ItemGroup> | 79 | </ItemGroup> |
| 76 | 80 | ||
| 77 | <ItemGroup> | 81 | <ItemGroup> |
| 78 | <None Include="packages.config" /> | 82 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 83 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 79 | </ItemGroup> | 84 | </ItemGroup> |
| 80 | 85 | ||
| 81 | <Target Name="PackNativeNuget" | ||
| 82 | DependsOnTargets="GetBuildVersion"> | ||
| 83 | <Exec Command='nuget pack wcautil.nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=WixToolset.WcaUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' /> | ||
| 84 | </Target> | ||
| 85 | |||
| 86 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 86 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 87 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 87 | </Project> |
| 88 | <PropertyGroup> | ||
| 89 | <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> | ||
| 90 | </PropertyGroup> | ||
| 91 | <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'))" /> | ||
| 92 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
| 93 | </Target> | ||
| 94 | </Project> \ No newline at end of file | ||
diff --git a/src/libs/wcautil/appveyor.cmd b/src/libs/wcautil/appveyor.cmd deleted file mode 100644 index a2596256..00000000 --- a/src/libs/wcautil/appveyor.cmd +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | |||
| 4 | nuget restore || exit /b | ||
| 5 | |||
| 6 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140 || exit /b | ||
| 7 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140 || exit /b | ||
| 8 | |||
| 9 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141 || exit /b | ||
| 10 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141 || exit /b | ||
| 11 | msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141 || exit /b | ||
| 12 | |||
| 13 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v142 || exit /b | ||
| 14 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v142 || exit /b | ||
| 15 | msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142 || exit /b | ||
| 16 | |||
| 17 | msbuild -p:Configuration=Release -t:PackNativeNuget src\wcautil\wcautil.vcxproj || exit /b | ||
| 18 | |||
| 19 | @popd | ||
| 20 | @endlocal \ No newline at end of file | ||
diff --git a/src/libs/wcautil/appveyor.yml b/src/libs/wcautil/appveyor.yml deleted file mode 100644 index bbf880f0..00000000 --- a/src/libs/wcautil/appveyor.yml +++ /dev/null | |||
| @@ -1,35 +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 | image: Visual Studio 2019 | ||
| 7 | |||
| 8 | version: 0.0.0.{build} | ||
| 9 | configuration: Release | ||
| 10 | |||
| 11 | environment: | ||
| 12 | DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | ||
| 13 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 | ||
| 14 | NUGET_XMLDOC_MODE: skip | ||
| 15 | |||
| 16 | build_script: | ||
| 17 | - appveyor.cmd | ||
| 18 | |||
| 19 | pull_requests: | ||
| 20 | do_not_increment_build_number: true | ||
| 21 | |||
| 22 | nuget: | ||
| 23 | disable_publish_on_pr: true | ||
| 24 | |||
| 25 | skip_branch_with_pr: true | ||
| 26 | skip_tags: true | ||
| 27 | |||
| 28 | artifacts: | ||
| 29 | - path: build\Release\**\*.nupkg | ||
| 30 | name: nuget | ||
| 31 | |||
| 32 | notifications: | ||
| 33 | - provider: Slack | ||
| 34 | incoming_webhook: | ||
| 35 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/libs/wcautil/nuget.config b/src/libs/wcautil/nuget.config deleted file mode 100644 index 790be2b0..00000000 --- a/src/libs/wcautil/nuget.config +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 6 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 7 | </packageSources> | ||
| 8 | </configuration> \ No newline at end of file | ||
diff --git a/src/nuget.config b/src/nuget.config new file mode 100644 index 00000000..c2f68b16 --- /dev/null +++ b/src/nuget.config | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <config> | ||
| 4 | <add key="repositoryPath" value="..\packages" /> | ||
| 5 | </config> | ||
| 6 | <packageSources> | ||
| 7 | <clear /> | ||
| 8 | <add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 9 | <add key="build" value="..\build\artifacts" /> | ||
| 10 | <!-- <add key="github" value="https://nuget.pkg.github.com/wixtoolset/UnifiedTest1/index.json" /> --> | ||
| 11 | </packageSources> | ||
| 12 | </configuration> | ||
diff --git a/src/nuget_official.config b/src/nuget_official.config new file mode 100644 index 00000000..6d3c9a07 --- /dev/null +++ b/src/nuget_official.config | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <config> | ||
| 4 | <add key="repositoryPath" value="..\packages" /> | ||
| 5 | </config> | ||
| 6 | <packageSources> | ||
| 7 | <clear /> | ||
| 8 | <add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 9 | <!-- <add key="github" value="https://nuget.pkg.github.com/wixtoolset/UnifiedTest1/index.json" /> --> | ||
| 10 | <add key="build" value="..\build\artifacts" /> | ||
| 11 | </packageSources> | ||
| 12 | </configuration> | ||
diff --git a/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj b/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj index c6982532..858db59c 100644 --- a/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj +++ b/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj | |||
| @@ -15,19 +15,13 @@ | |||
| 15 | </PropertyGroup> | 15 | </PropertyGroup> |
| 16 | 16 | ||
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 19 | </ItemGroup> | ||
| 20 | |||
| 21 | <ItemGroup> | ||
| 22 | <ProjectReference Include="..\..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" /> | 18 | <ProjectReference Include="..\..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" /> |
| 23 | <ProjectReference Include="..\..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> | 19 | <ProjectReference Include="..\..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> |
| 24 | <ProjectReference Include="..\..\WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj" /> | 20 | <ProjectReference Include="..\..\WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj" /> |
| 25 | </ItemGroup> | 21 | </ItemGroup> |
| 26 | 22 | ||
| 27 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 23 | <ItemGroup> |
| 28 | <PropertyGroup> | 24 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> |
| 29 | <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> | 25 | <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" /> |
| 30 | </PropertyGroup> | 26 | </ItemGroup> |
| 31 | <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
| 32 | </Target> | ||
| 33 | </Project> | 27 | </Project> |
diff --git a/src/samples/thmviewer/packages.config b/src/samples/thmviewer/packages.config index a98c0c8e..cadaff8a 100644 --- a/src/samples/thmviewer/packages.config +++ b/src/samples/thmviewer/packages.config | |||
| @@ -3,6 +3,6 @@ | |||
| 3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | 3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> |
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> |
| 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> |
| 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | 6 | <package id="GitInfo" version="2.1.2" targetFramework="native" developmentDependency="true" /> |
| 7 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | 7 | <package id="WixToolset.DUtil" version="4.0.0-preview.0-build.1" targetFramework="native" /> |
| 8 | </packages> \ No newline at end of file | 8 | </packages> \ No newline at end of file |
diff --git a/src/samples/thmviewer/thmviewer.vcxproj b/src/samples/thmviewer/thmviewer.vcxproj index c02dc237..e11551af 100644 --- a/src/samples/thmviewer/thmviewer.vcxproj +++ b/src/samples/thmviewer/thmviewer.vcxproj | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> | 5 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> |
| 6 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | 6 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> |
| 7 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | 7 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> |
| 8 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | 8 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props')" /> |
| 9 | 9 | ||
| 10 | <ItemGroup Label="ProjectConfigurations"> | 10 | <ItemGroup Label="ProjectConfigurations"> |
| 11 | <ProjectConfiguration Include="Debug|Win32"> | 11 | <ProjectConfiguration Include="Debug|Win32"> |
| @@ -83,6 +83,6 @@ | |||
| 83 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> | 83 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> |
| 84 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | 84 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> |
| 85 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | 85 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> |
| 86 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | 86 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props'))" /> |
| 87 | </Target> | 87 | </Target> |
| 88 | </Project> \ No newline at end of file | 88 | </Project> \ No newline at end of file |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs deleted file mode 100644 index 92a9602f..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | ||
| 4 | <PackageGroup Id="BundlePackages"> | ||
| 5 | <PackageGroupRef Id="MinimalPackageGroup" /> | ||
| 6 | </PackageGroup> | ||
| 7 | <PayloadGroup Id="OrphanPayloads"> | ||
| 8 | <Payload Id="OrphanPayload" SourceFile="$(sys.SOURCEFILEPATH)" /> | ||
| 9 | </PayloadGroup> | ||
| 10 | </Fragment> | ||
| 11 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs deleted file mode 100644 index a00874ce..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | ||
| 4 | <PackageGroup Id="BundlePackages"> | ||
| 5 | <PackageGroupRef Id="MinimalPackageGroup" /> | ||
| 6 | </PackageGroup> | ||
| 7 | <Container Id="First"> | ||
| 8 | <PackageGroupRef Id="BundlePackages" /> | ||
| 9 | </Container> | ||
| 10 | <Container Id="Second"> | ||
| 11 | <PackageGroupRef Id="BundlePackages" /> | ||
| 12 | </Container> | ||
| 13 | </Fragment> | ||
| 14 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoAttachedContainer.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoAttachedContainer.wxs deleted file mode 100644 index ec757c5d..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoAttachedContainer.wxs +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | ||
| 4 | <PackageGroup Id="BundlePackages"> | ||
| 5 | <MsiPackage Id="FirstX86"> | ||
| 6 | <PayloadGroupRef Id="FirstX86Payloads" /> | ||
| 7 | </MsiPackage> | ||
| 8 | <MsiPackage Id="FirstX64" Name="FirstX64\FirstX64.msi" SourceFile="FirstX64\" DownloadUrl="http://example.com/{0}/{1}/{2}" /> | ||
| 9 | </PackageGroup> | ||
| 10 | <Container Id="BundlePackages" Type="attached"> | ||
| 11 | <PackageGroupRef Id="BundlePackages" /> | ||
| 12 | </Container> | ||
| 13 | <PayloadGroup Id="FirstX86Payloads"> | ||
| 14 | <MsiPackagePayload Name="FirstX86\FirstX86.msi" SourceFile="FirstX86\" DownloadUrl="http://example.com/{0}/{1}/{2}" /> | ||
| 15 | </PayloadGroup> | ||
| 16 | </Fragment> | ||
| 17 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs deleted file mode 100644 index 0c5f8c7e..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{B5B23622-239B-4E3B-BDAB-67648CB975BF}"> | ||
| 4 | <BootstrapperApplication> | ||
| 5 | <BootstrapperApplicationDll SourceFile="fakeba.dll" /> | ||
| 6 | </BootstrapperApplication> | ||
| 7 | <Chain> | ||
| 8 | <PackageGroupRef Id="BundlePackages" /> | ||
| 9 | </Chain> | ||
| 10 | <PayloadGroupRef Id="Shared" /> | ||
| 11 | </Bundle> | ||
| 12 | <Fragment> | ||
| 13 | <PackageGroup Id="BundlePackages"> | ||
| 14 | <PackageGroupRef Id="FirstX64" /> | ||
| 15 | </PackageGroup> | ||
| 16 | <PackageGroup Id="FirstX64"> | ||
| 17 | <MsiPackage SourceFile="FirstX64.msi"> | ||
| 18 | <PayloadGroupRef Id="Shared" /> | ||
| 19 | </MsiPackage> | ||
| 20 | </PackageGroup> | ||
| 21 | <Container Id="FirstX64" Name="FirstX64" Type="detached"> | ||
| 22 | <PackageGroupRef Id="FirstX64" /> | ||
| 23 | </Container> | ||
| 24 | <PayloadGroup Id="Shared"> | ||
| 25 | <Payload Id="SharedPayload" SourceFile="$(sys.SOURCEFILEPATH)" /> | ||
| 26 | </PayloadGroup> | ||
| 27 | </Fragment> | ||
| 28 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs deleted file mode 100644 index c7f549a3..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Fragment> | ||
| 4 | <PackageGroup Id="BundlePackages"> | ||
| 5 | <PackageGroupRef Id="FirstX86" /> | ||
| 6 | <PackageGroupRef Id="FirstX64" /> | ||
| 7 | </PackageGroup> | ||
| 8 | <PackageGroup Id="FirstX86"> | ||
| 9 | <MsiPackage SourceFile="FirstX86.msi"> | ||
| 10 | <PayloadGroupRef Id="Shared" /> | ||
| 11 | </MsiPackage> | ||
| 12 | </PackageGroup> | ||
| 13 | <PackageGroup Id="FirstX64"> | ||
| 14 | <MsiPackage SourceFile="FirstX64.msi"> | ||
| 15 | <PayloadGroupRef Id="Shared" /> | ||
| 16 | </MsiPackage> | ||
| 17 | </PackageGroup> | ||
| 18 | <Container Id="FirstX86" Name="FirstX86" Type="detached"> | ||
| 19 | <PackageGroupRef Id="FirstX86" /> | ||
| 20 | </Container> | ||
| 21 | <Container Id="FirstX64" Name="FirstX64" Type="detached"> | ||
| 22 | <PackageGroupRef Id="FirstX64" /> | ||
| 23 | </Container> | ||
| 24 | <PayloadGroup Id="Shared"> | ||
| 25 | <Payload Id="SharedPayload" SourceFile="$(sys.SOURCEFILEPATH)" /> | ||
| 26 | </PayloadGroup> | ||
| 27 | </Fragment> | ||
| 28 | </Wix> | ||
diff --git a/src/test/burn/BurnE2ETests.sln b/src/test/burn/BurnE2ETests.sln index 7cdb0cf0..f7850250 100644 --- a/src/test/burn/BurnE2ETests.sln +++ b/src/test/burn/BurnE2ETests.sln | |||
| @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
| 3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
| 4 | VisualStudioVersion = 16.0.29503.13 | 4 | VisualStudioVersion = 16.0.29503.13 |
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
| 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBA", "src\TestBA\TestBA.csproj", "{04022D35-6D75-49D0-91D2-4208E09DBA6D}" | 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBA", "TestBA\TestBA.csproj", "{04022D35-6D75-49D0-91D2-4208E09DBA6D}" |
| 7 | EndProject | 7 | EndProject |
| 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestExe", "src\TestExe\TestExe.csproj", "{B038B342-BE42-4951-82A9-7789412CF37F}" | 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestExe", "TestExe\TestExe.csproj", "{B038B342-BE42-4951-82A9-7789412CF37F}" |
| 9 | EndProject | 9 | EndProject |
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixTestTools", "src\WixTestTools\WixTestTools.csproj", "{3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixTestTools", "WixTestTools\WixTestTools.csproj", "{3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}" |
| 11 | EndProject | 11 | EndProject |
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BurnE2E", "src\WixToolsetTest.BurnE2E\WixToolsetTest.BurnE2E.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" | 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BurnE2E", "WixToolsetTest.BurnE2E\WixToolsetTest.BurnE2E.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" |
| 13 | EndProject | 13 | EndProject |
| 14 | Global | 14 | Global |
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/test/burn/Directory.Build.props b/src/test/burn/Directory.Build.props index f83cc154..1b3f67fe 100644 --- a/src/test/burn/Directory.Build.props +++ b/src/test/burn/Directory.Build.props | |||
| @@ -1,29 +1,11 @@ | |||
| 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 | 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> | 3 | <Project> |
| 8 | <PropertyGroup> | 4 | <PropertyGroup> |
| 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 5 | <SegmentName>IntegrationBurn</SegmentName> |
| 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | 6 | <SignOutput>false</SignOutput> |
| 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' " /> | 10 | <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> |
| 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> | 11 | </Project> |
diff --git a/src/test/burn/Directory.Build.targets b/src/test/burn/Directory.Build.targets index 265b5cfd..4e97b6ca 100644 --- a/src/test/burn/Directory.Build.targets +++ b/src/test/burn/Directory.Build.targets | |||
| @@ -1,50 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | <!-- | ||
| 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> | 3 | <Project> |
| 12 | <PropertyGroup> | 4 | <Import Project="..\..\Directory.Build.targets" /> |
| 13 | <ReplacePackageReferences>true</ReplacePackageReferences> | 5 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> |
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | |||
| 49 | <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " /> | ||
| 50 | </Project> | 6 | </Project> |
diff --git a/src/test/burn/Wix.Build.props b/src/test/burn/Directory.wixproj.props index 06cf5b1d..06cf5b1d 100644 --- a/src/test/burn/Wix.Build.props +++ b/src/test/burn/Directory.wixproj.props | |||
diff --git a/src/test/burn/Wix.Build.targets b/src/test/burn/Directory.wixproj.targets index 17a46e2a..17a46e2a 100644 --- a/src/test/burn/Wix.Build.targets +++ b/src/test/burn/Directory.wixproj.targets | |||
diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj index 74df28dc..183ea02d 100644 --- a/src/test/burn/TestBA/TestBA.csproj +++ b/src/test/burn/TestBA/TestBA.csproj | |||
| @@ -19,6 +19,6 @@ | |||
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | 20 | ||
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.58" /> | 22 | <PackageReference Include="WixToolset.Mba.Core" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> \ No newline at end of file | 24 | </Project> |
diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj index 1368e0f0..8e2bf513 100644 --- a/src/test/burn/TestBA/TestBA_x64.csproj +++ b/src/test/burn/TestBA/TestBA_x64.csproj | |||
| @@ -19,6 +19,6 @@ | |||
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | 20 | ||
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.58" /> | 22 | <PackageReference Include="WixToolset.Mba.Core" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> \ No newline at end of file | 24 | </Project> |
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj index 591272b3..dcd38527 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj | |||
| @@ -12,6 +12,6 @@ | |||
| 12 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | 12 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | </Project> \ No newline at end of file | 17 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj index 3f405ce5..7e29856f 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj | |||
| @@ -13,6 +13,6 @@ | |||
| 13 | <ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" /> | 13 | <ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 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/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj index 8ea9afe0..6f39097a 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj index 1b1a5006..c940f02a 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" /> | 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 18 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 19 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 19 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj index 104a6003..0eb66ee3 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 18 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 18 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj index 3b9d7360..af028ed4 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" /> | 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 18 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 19 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 19 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj index 360bcf86..4fe00693 100644 --- a/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj index 698b1d62..ab711157 100644 --- a/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj index 0acc29c4..69f53a86 100644 --- a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj | |||
| @@ -12,8 +12,8 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | <!-- We do this dynamically to avoid committing such a large file to source control. --> | 18 | <!-- We do this dynamically to avoid committing such a large file to source control. --> |
| 19 | <Target Name="CreateLargeFile" AfterTargets="BeforeBuild" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\fivegb.file"> | 19 | <Target Name="CreateLargeFile" AfterTargets="BeforeBuild" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\fivegb.file"> |
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj index 3f7882cf..8a5c9594 100644 --- a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj | |||
| @@ -9,8 +9,8 @@ | |||
| 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 12 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 13 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 13 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 14 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 14 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | </Project> \ No newline at end of file | 16 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj index e71ef750..4c6a0993 100644 --- a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj | |||
| @@ -9,8 +9,8 @@ | |||
| 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 12 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 13 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 13 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 14 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 14 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | </Project> \ No newline at end of file | 16 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj index 58a613d6..2d2f4eaa 100644 --- a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 11 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 14 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 15 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 15 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 16 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 16 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 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/burn/TestData/DependencyTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj index ffa7e897..cd65ea69 100644 --- a/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj | |||
| @@ -15,8 +15,8 @@ | |||
| 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 18 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 19 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 19 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 20 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 20 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | </Project> \ No newline at end of file | 22 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj index 6de1c0c1..25af31de 100644 --- a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj | |||
| @@ -15,8 +15,8 @@ | |||
| 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 18 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 19 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 19 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 20 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 20 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | </Project> \ No newline at end of file | 22 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj index cd4e89ca..3fddc2d4 100644 --- a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 18 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 18 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 19 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 19 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj index 33154672..4473657a 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 18 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 18 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 19 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 19 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj index a0708443..2674b9d6 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj | |||
| @@ -13,8 +13,8 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 18 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj index 3c09fd2c..542f3562 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 18 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 18 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 19 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 19 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj index c7d907a2..1c8ad4d3 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj | |||
| @@ -9,8 +9,8 @@ | |||
| 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 12 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 13 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 13 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 14 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 14 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | </Project> \ No newline at end of file | 16 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj index 949309dc..dcc89f67 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj | |||
| @@ -10,8 +10,8 @@ | |||
| 10 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 10 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 13 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 14 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 14 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 15 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 15 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | </Project> \ No newline at end of file | 17 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj index 6ff25fcb..14817b3a 100644 --- a/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 7 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 8 | </ItemGroup> | 8 | </ItemGroup> |
| 9 | <ItemGroup> | 9 | <ItemGroup> |
| 10 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 10 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 11 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 11 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | </Project> \ No newline at end of file | 13 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj index 794e72bc..6a96e230 100644 --- a/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 10 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 13 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 14 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 14 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | </Project> \ No newline at end of file | 16 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj index 85fd0f92..5a418642 100644 --- a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 18 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 18 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 19 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 19 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj index 212ef3d6..e31d3423 100644 --- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 18 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 18 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 19 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 19 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj index e7abd24a..f0b03f2d 100644 --- a/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 7 | </ItemGroup> | 7 | </ItemGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 9 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 10 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 10 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj index e9e7478e..a00ff3b5 100644 --- a/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 12 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 13 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 13 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | </Project> \ No newline at end of file | 15 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj b/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj index c5727cf6..e1a60b4e 100644 --- a/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj | |||
| @@ -13,8 +13,8 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 18 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj index 1cac7394..5ebce845 100644 --- a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj | |||
| @@ -2,6 +2,6 @@ | |||
| 2 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <Import Project="PackageA.props" /> | 3 | <Import Project="PackageA.props" /> |
| 4 | <ItemGroup> | 4 | <ItemGroup> |
| 5 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 5 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 6 | </ItemGroup> | 6 | </ItemGroup> |
| 7 | </Project> \ No newline at end of file | 7 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj index d395391e..73a7cb6f 100644 --- a/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj | |||
| @@ -8,6 +8,6 @@ | |||
| 8 | <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" /> | 8 | <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" /> |
| 9 | </ItemGroup> | 9 | </ItemGroup> |
| 10 | <ItemGroup> | 10 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 11 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | </Project> \ No newline at end of file | 13 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj index e7a497f4..37e88de9 100644 --- a/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj | |||
| @@ -8,6 +8,6 @@ | |||
| 8 | <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" /> | 8 | <Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" /> |
| 9 | </ItemGroup> | 9 | </ItemGroup> |
| 10 | <ItemGroup> | 10 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 11 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | </Project> \ No newline at end of file | 13 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PackageB/PackageB.wixproj b/src/test/burn/TestData/DependencyTests/PackageB/PackageB.wixproj index a82822f8..86cf23bb 100644 --- a/src/test/burn/TestData/DependencyTests/PackageB/PackageB.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageB/PackageB.wixproj | |||
| @@ -8,6 +8,6 @@ | |||
| 8 | <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" /> | 8 | <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" /> |
| 9 | </ItemGroup> | 9 | </ItemGroup> |
| 10 | <ItemGroup> | 10 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 11 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | </Project> \ No newline at end of file | 13 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PackageC/PackageC.wixproj b/src/test/burn/TestData/DependencyTests/PackageC/PackageC.wixproj index ef61d053..4eb2d00b 100644 --- a/src/test/burn/TestData/DependencyTests/PackageC/PackageC.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageC/PackageC.wixproj | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" /> | 7 | <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" /> |
| 8 | </ItemGroup> | 8 | </ItemGroup> |
| 9 | <ItemGroup> | 9 | <ItemGroup> |
| 10 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 10 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 11 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 11 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | </Project> \ No newline at end of file | 13 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj b/src/test/burn/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj index 3d9cf384..55093cdc 100644 --- a/src/test/burn/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj | |||
| @@ -2,6 +2,6 @@ | |||
| 2 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <Import Project="PackageD.props" /> | 3 | <Import Project="PackageD.props" /> |
| 4 | <ItemGroup> | 4 | <ItemGroup> |
| 5 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 5 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 6 | </ItemGroup> | 6 | </ItemGroup> |
| 7 | </Project> \ No newline at end of file | 7 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj b/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj index 2bb6e8bd..41df45d5 100644 --- a/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj | |||
| @@ -8,6 +8,6 @@ | |||
| 8 | <Compile Include="..\PackageDv1\Package.wxs" Link="Package.wxs" /> | 8 | <Compile Include="..\PackageDv1\Package.wxs" Link="Package.wxs" /> |
| 9 | </ItemGroup> | 9 | </ItemGroup> |
| 10 | <ItemGroup> | 10 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 11 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | </Project> \ No newline at end of file | 13 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj b/src/test/burn/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj index 091b7b24..10aa2101 100644 --- a/src/test/burn/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj | |||
| @@ -2,6 +2,6 @@ | |||
| 2 | <Project Sdk="WixToolset.Sdk"> | 2 | <Project Sdk="WixToolset.Sdk"> |
| 3 | <Import Project="PackageE.props" /> | 3 | <Import Project="PackageE.props" /> |
| 4 | <ItemGroup> | 4 | <ItemGroup> |
| 5 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 5 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 6 | </ItemGroup> | 6 | </ItemGroup> |
| 7 | </Project> \ No newline at end of file | 7 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj index 1fb93130..888b3ceb 100644 --- a/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj | |||
| @@ -8,6 +8,6 @@ | |||
| 8 | <Compile Include="..\PackageEv1\ProductComponents.wxs" Link="ProductComponents.wxs" /> | 8 | <Compile Include="..\PackageEv1\ProductComponents.wxs" Link="ProductComponents.wxs" /> |
| 9 | </ItemGroup> | 9 | </ItemGroup> |
| 10 | <ItemGroup> | 10 | <ItemGroup> |
| 11 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 11 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | </Project> \ No newline at end of file | 13 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj index b6653a19..4809934d 100644 --- a/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj +++ b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj | |||
| @@ -10,6 +10,6 @@ | |||
| 10 | <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" /> | 10 | <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 13 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | </Project> \ No newline at end of file | 15 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj b/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj index cf28a9c9..c099f008 100644 --- a/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj +++ b/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj | |||
| @@ -10,6 +10,6 @@ | |||
| 10 | <ProjectReference Include="..\PackageAv1_0_2\PackageAv1_0_2.wixproj" /> | 10 | <ProjectReference Include="..\PackageAv1_0_2\PackageAv1_0_2.wixproj" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | 13 | <PackageReference Include="WixToolset.Dependency.wixext" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | </Project> \ No newline at end of file | 15 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj index a1650507..27c6e583 100644 --- a/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 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/burn/TestData/FailureTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj index 321f139c..9cd861af 100644 --- a/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj index 1a5d5837..4b2da9fd 100644 --- a/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 10 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 13 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 14 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 14 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | </Project> \ No newline at end of file | 16 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj index 60bd5ef7..37784e81 100644 --- a/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj index d968e8ab..ee0e38cb 100644 --- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 7 | </ItemGroup> | 7 | </ItemGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 9 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 10 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 10 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj index a50dbb87..b094f48a 100644 --- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj +++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 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/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj index 5b025236..18a3e364 100644 --- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj +++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 7 | </ItemGroup> | 7 | </ItemGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 9 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 10 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 10 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj index e0512e06..e3fc3a86 100644 --- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj +++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 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/burn/TestData/LayoutTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj index 4cf9c875..3b1e871c 100644 --- a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj | |||
| @@ -9,8 +9,8 @@ | |||
| 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 12 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 13 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 13 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <!-- Workaround wix.targets brokenness --> | 15 | <!-- Workaround wix.targets brokenness --> |
| 16 | <Target Name="CopyUncompressedFiles" AfterTargets="AfterBuild"> | 16 | <Target Name="CopyUncompressedFiles" AfterTargets="AfterBuild"> |
diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj index cb9f4b89..2a284491 100644 --- a/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj | |||
| @@ -7,6 +7,6 @@ | |||
| 7 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> | 7 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> |
| 8 | </ItemGroup> | 8 | </ItemGroup> |
| 9 | <ItemGroup> | 9 | <ItemGroup> |
| 10 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 10 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj index 8272c6bd..a259ed2e 100644 --- a/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj +++ b/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj | |||
| @@ -10,6 +10,6 @@ | |||
| 10 | <ProjectReference Include="..\PackageD\PackageD.wixproj" /> | 10 | <ProjectReference Include="..\PackageD\PackageD.wixproj" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 13 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | </Project> \ No newline at end of file | 15 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj index 1a56957b..8ee83380 100644 --- a/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj +++ b/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> | 5 | <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> |
| 6 | </ItemGroup> | 6 | </ItemGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 8 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 9 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 9 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | </Project> \ No newline at end of file | 11 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj index e1cb68db..70bec122 100644 --- a/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj +++ b/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 12 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 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/burn/TestData/MsiTransactionTests/PackageF/PackageF.wixproj b/src/test/burn/TestData/MsiTransactionTests/PackageF/PackageF.wixproj index 753b054e..575ffe5a 100644 --- a/src/test/burn/TestData/MsiTransactionTests/PackageF/PackageF.wixproj +++ b/src/test/burn/TestData/MsiTransactionTests/PackageF/PackageF.wixproj | |||
| @@ -7,6 +7,6 @@ | |||
| 7 | <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" /> | 7 | <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" /> |
| 8 | </ItemGroup> | 8 | </ItemGroup> |
| 9 | <ItemGroup> | 9 | <ItemGroup> |
| 10 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 10 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj index 72419d2d..8ca41da7 100644 --- a/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj index a506e843..9b91b3f4 100644 --- a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj +++ b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj b/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj index 9a022091..b80d5613 100644 --- a/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj +++ b/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 18 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 18 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj index 13bb159b..e09a6aa4 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj | |||
| @@ -16,6 +16,6 @@ | |||
| 16 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 16 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | <ItemGroup> | 18 | <ItemGroup> |
| 19 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 19 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj index cfbc77b5..d4288d4b 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj | |||
| @@ -16,6 +16,6 @@ | |||
| 16 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 16 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | <ItemGroup> | 18 | <ItemGroup> |
| 19 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 19 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/PrereqBaTests/PackageF/PackageF.wixproj b/src/test/burn/TestData/PrereqBaTests/PackageF/PackageF.wixproj index 0a750fe0..00ffb7d8 100644 --- a/src/test/burn/TestData/PrereqBaTests/PackageF/PackageF.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/PackageF/PackageF.wixproj | |||
| @@ -7,6 +7,6 @@ | |||
| 7 | <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" /> | 7 | <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" /> |
| 8 | </ItemGroup> | 8 | </ItemGroup> |
| 9 | <ItemGroup> | 9 | <ItemGroup> |
| 10 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 10 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj index a6ccd842..1a1df1b6 100644 --- a/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 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/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj index 648cc934..5d7e7756 100644 --- a/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj | |||
| @@ -15,6 +15,6 @@ | |||
| 15 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 15 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 18 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj index 071c40a0..004f0d01 100644 --- a/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj +++ b/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj | |||
| @@ -7,6 +7,6 @@ | |||
| 7 | <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" /> | 7 | <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" /> |
| 8 | </ItemGroup> | 8 | </ItemGroup> |
| 9 | <ItemGroup> | 9 | <ItemGroup> |
| 10 | <PackageReference Include="WixToolset.Util.wixext" Version="4.0.96" /> | 10 | <PackageReference Include="WixToolset.Util.wixext" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj index b6ab068a..80c91e07 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj index ac33c5ad..0a320fa5 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj index 3ca849a3..e489a5cf 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 18 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 18 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj index 377e939c..5e8f6d13 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 18 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 19 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 19 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj index 12f11444..7a3a99a7 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj index 193244ca..72634a2f 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 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/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj index 11995ddd..1f950289 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 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/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj index ae90dd73..d2ab7907 100644 --- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj | |||
| @@ -14,6 +14,6 @@ | |||
| 14 | <ProjectReference Include="..\..\..\TestExe\TestExe.csproj" /> | 14 | <ProjectReference Include="..\..\..\TestExe\TestExe.csproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj index 9b7d3c17..7f3c5890 100644 --- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj +++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj | |||
| @@ -15,6 +15,6 @@ | |||
| 15 | <ProjectReference Include="..\..\..\TestExe\TestExe_x64.csproj" /> | 15 | <ProjectReference Include="..\..\..\TestExe\TestExe_x64.csproj" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 18 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/TestData.proj b/src/test/burn/TestData/TestData.proj index c5682fc7..3f56d5b7 100644 --- a/src/test/burn/TestData/TestData.proj +++ b/src/test/burn/TestData/TestData.proj | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | 3 | ||
| 4 | |||
| 5 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 6 | <ItemGroup> | 5 | <ItemGroup> |
| 7 | <TestDataProject Include="**\*.wixproj" /> | 6 | <TestDataProject Include="**\*.wixproj" /> |
| @@ -22,4 +21,4 @@ | |||
| 22 | <Target Name="Restore"> | 21 | <Target Name="Restore"> |
| 23 | <MSBuild Projects="%(TestDataProject.Identity)" Targets="Restore" /> | 22 | <MSBuild Projects="%(TestDataProject.Identity)" Targets="Restore" /> |
| 24 | </Target> | 23 | </Target> |
| 25 | </Project> \ No newline at end of file | 24 | </Project> |
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj index d968e8ab..ee0e38cb 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 7 | </ItemGroup> | 7 | </ItemGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 9 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 10 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 10 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj index 07e9581b..13001858 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 12 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 13 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 13 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | </Project> \ No newline at end of file | 15 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj index b2685e2e..93a1dae6 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj | |||
| @@ -9,8 +9,8 @@ | |||
| 9 | <Feeds Include="*.xml" /> | 9 | <Feeds Include="*.xml" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 12 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 13 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 13 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <Target Name="CopyFeeds" AfterTargets="AfterBuild"> | 15 | <Target Name="CopyFeeds" AfterTargets="AfterBuild"> |
| 16 | <Copy SourceFiles="@(Feeds)" DestinationFolder="$(OutputPath)" /> | 16 | <Copy SourceFiles="@(Feeds)" DestinationFolder="$(OutputPath)" /> |
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj index a11fc252..877b4971 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 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/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj index d968e8ab..ee0e38cb 100644 --- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 7 | </ItemGroup> | 7 | </ItemGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 9 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 10 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 10 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj index 07e9581b..13001858 100644 --- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj +++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" /> | 12 | <PackageReference Include="WixToolset.Bal.wixext" /> |
| 13 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" /> | 13 | <PackageReference Include="WixToolset.NetFx.wixext" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | </Project> \ No newline at end of file | 15 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestExe/TestExe.csproj b/src/test/burn/TestExe/TestExe.csproj index 5a130422..016ae4e5 100644 --- a/src/test/burn/TestExe/TestExe.csproj +++ b/src/test/burn/TestExe/TestExe.csproj | |||
| @@ -17,4 +17,4 @@ | |||
| 17 | <ItemGroup Condition="'$(TargetFramework)'=='net35'"> | 17 | <ItemGroup Condition="'$(TargetFramework)'=='net35'"> |
| 18 | <Reference Include="System.Management" /> | 18 | <Reference Include="System.Management" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | </Project> |
diff --git a/src/test/burn/TestExe/TestExe_x64.csproj b/src/test/burn/TestExe/TestExe_x64.csproj index 1dd2d8e6..ef981d73 100644 --- a/src/test/burn/TestExe/TestExe_x64.csproj +++ b/src/test/burn/TestExe/TestExe_x64.csproj | |||
| @@ -14,4 +14,4 @@ | |||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <Reference Include="System.Management" /> | 15 | <Reference Include="System.Management" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | </Project> \ No newline at end of file | 17 | </Project> |
diff --git a/src/test/burn/WixTestTools/WixTestTools.csproj b/src/test/burn/WixTestTools/WixTestTools.csproj index 58f02be7..7b726560 100644 --- a/src/test/burn/WixTestTools/WixTestTools.csproj +++ b/src/test/burn/WixTestTools/WixTestTools.csproj | |||
| @@ -8,14 +8,14 @@ | |||
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
| 10 | <ItemGroup> | 10 | <ItemGroup> |
| 11 | <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> | 11 | <PackageReference Include="Microsoft.Win32.Registry" /> |
| 12 | <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> | 12 | <PackageReference Include="System.Security.Principal.Windows" /> |
| 13 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.50" /> | 13 | <PackageReference Include="WixBuildTools.TestSupport" /> |
| 14 | <PackageReference Include="WixToolset.Data" Version="4.0.218" /> | 14 | <PackageReference Include="WixToolset.Data" /> |
| 15 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.58" /> | 15 | <PackageReference Include="WixToolset.Mba.Core" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | 17 | ||
| 18 | <ItemGroup> | 18 | <ItemGroup> |
| 19 | <PackageReference Include="xunit" Version="2.4.1" /> | 19 | <PackageReference Include="xunit" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> | 21 | </Project> |
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj index 2aee1157..88b8dcb0 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj +++ b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj | |||
| @@ -17,17 +17,17 @@ | |||
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <PackageReference Include="Microsoft.AspNetCore.Owin" Version="3.1.13" /> | 20 | <PackageReference Include="Microsoft.AspNetCore.Owin" /> |
| 21 | <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> | 21 | <PackageReference Include="Microsoft.Win32.Registry" /> |
| 22 | <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> | 22 | <PackageReference Include="System.Security.Principal.Windows" /> |
| 23 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.50" /> | 23 | <PackageReference Include="WixBuildTools.TestSupport" /> |
| 24 | <PackageReference Include="WixToolset.Data" Version="4.0.218" /> | 24 | <PackageReference Include="WixToolset.Data" /> |
| 25 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.58" /> | 25 | <PackageReference Include="WixToolset.Mba.Core" /> |
| 26 | </ItemGroup> | 26 | </ItemGroup> |
| 27 | 27 | ||
| 28 | <ItemGroup> | 28 | <ItemGroup> |
| 29 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | 29 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 30 | <PackageReference Include="xunit" Version="2.4.1" /> | 30 | <PackageReference Include="xunit" /> |
| 31 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 31 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
| 32 | </ItemGroup> | 32 | </ItemGroup> |
| 33 | </Project> | 33 | </Project> |
diff --git a/src/test/burn/appveyor.cmd b/src/test/burn/appveyor.cmd deleted file mode 100644 index c0d965e5..00000000 --- a/src/test/burn/appveyor.cmd +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | |||
| 5 | msbuild -p:Configuration=%_C% -warnaserror -Restore || exit /b | ||
| 6 | msbuild -p:Configuration=%_C% src\TestData -Restore || exit /b | ||
| 7 | |||
| 8 | dotnet test -c %_C% --no-build src\WixToolsetTest.BurnE2E || exit /b | ||
| 9 | |||
| 10 | @popd | ||
| 11 | @endlocal | ||
diff --git a/src/test/burn/global.json b/src/test/burn/global.json deleted file mode 100644 index 697f5687..00000000 --- a/src/test/burn/global.json +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | { | ||
| 2 | "msbuild-sdks": { | ||
| 3 | "WixToolset.Sdk": "4.0.0-build-0213" | ||
| 4 | }, | ||
| 5 | "sdk": { | ||
| 6 | "allowPrerelease": false | ||
| 7 | } | ||
| 8 | } | ||
diff --git a/src/test/burn/nuget.config b/src/test/burn/nuget.config deleted file mode 100644 index 9187a22e..00000000 --- a/src/test/burn/nuget.config +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-balutil" value="https://ci.appveyor.com/nuget/wixtoolset-balutil" /> | ||
| 6 | <add key="wixtoolset-bal-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-bal-wixext" /> | ||
| 7 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 8 | <add key="wixtoolset-dependency-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-dependency-wixext" /> | ||
| 9 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 10 | <add key="wixtoolset-netfx-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-netfx-wixext" /> | ||
| 11 | <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" /> | ||
| 12 | <add key="wixtoolset-util-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-util-wixext" /> | ||
| 13 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 14 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 15 | </packageSources> | ||
| 16 | </configuration> \ No newline at end of file | ||
diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd new file mode 100644 index 00000000..81df9f26 --- /dev/null +++ b/src/test/burn/test_burn.cmd | |||
| @@ -0,0 +1,17 @@ | |||
| 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 Burn integration tests %_C% | ||
| 10 | |||
| 11 | msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror || exit /b | ||
| 12 | msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj || exit /b | ||
| 13 | |||
| 14 | if /i "%RuntimeTestsEnabled%"=="true" dotnet test -c %_C% --no-build src\WixToolsetTest.BurnE2E | ||
| 15 | |||
| 16 | @popd | ||
| 17 | @endlocal | ||
diff --git a/src/test/run_test.cmd b/src/test/run_test.cmd new file mode 100644 index 00000000..ef6de9bd --- /dev/null +++ b/src/test/run_test.cmd | |||
| @@ -0,0 +1,15 @@ | |||
| 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 Run integration tests %_C% | ||
| 10 | |||
| 11 | @SET RuntimeTestsEnabled=true | ||
| 12 | @call burn\test_burn.cmd | ||
| 13 | |||
| 14 | @popd | ||
| 15 | @endlocal | ||
diff --git a/src/test/burn/appveyor.yml b/src/test/run_test.yml index d12975dc..787edeff 100644 --- a/src/test/burn/appveyor.yml +++ b/src/test/run_test.yml | |||
| @@ -9,13 +9,12 @@ environment: | |||
| 9 | NUGET_XMLDOC_MODE: skip | 9 | NUGET_XMLDOC_MODE: skip |
| 10 | RuntimeTestsEnabled: true | 10 | RuntimeTestsEnabled: true |
| 11 | 11 | ||
| 12 | |||
| 13 | install: | 12 | install: |
| 14 | - reg add HKLM\Software\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f | 13 | - reg add HKLM\Software\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f |
| 15 | - reg add HKLM\Software\WOW6432Node\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f | 14 | - reg add HKLM\Software\WOW6432Node\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f |
| 16 | 15 | ||
| 17 | build_script: | 16 | build_script: |
| 18 | - appveyor.cmd | 17 | - run_test.cmd |
| 19 | 18 | ||
| 20 | test: off | 19 | test: off |
| 21 | 20 | ||
diff --git a/src/test/test.cmd b/src/test/test.cmd new file mode 100644 index 00000000..b327ba75 --- /dev/null +++ b/src/test/test.cmd | |||
| @@ -0,0 +1,14 @@ | |||
| 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 Build integration tests %_C% | ||
| 10 | |||
| 11 | @call burn\test_burn.cmd %_C% | ||
| 12 | |||
| 13 | @popd | ||
| 14 | @endlocal | ||
diff --git a/src/version.json b/src/version.json deleted file mode 100644 index 2d200f90..00000000 --- a/src/version.json +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | { | ||
| 2 | "version": "4.0.0-preview.0-build.{height}", | ||
| 3 | "publicReleaseRefSpec": [ | ||
| 4 | "^refs/heads/master$" | ||
| 5 | ], | ||
| 6 | "cloudBuild": { | ||
| 7 | "buildNumber": { | ||
| 8 | "enabled": true | ||
| 9 | } | ||
| 10 | } | ||
| 11 | } | ||
diff --git a/src/version.txt b/src/version.txt index dc60d914..1a1c0674 100644 --- a/src/version.txt +++ b/src/version.txt | |||
| @@ -1 +1 @@ | |||
| v4.{apiversion}-preview.0-build.{height} | 4.0-preview.0-build.{height} | ||
diff --git a/src/wix/Directory.Build.props b/src/wix/Directory.Build.props index b3c6287c..2e4d6227 100644 --- a/src/wix/Directory.Build.props +++ b/src/wix/Directory.Build.props | |||
| @@ -1,27 +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>wix</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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | 9 | <Import Project="..\Directory.Build.props" /> |
| 26 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
| 27 | </Project> | 10 | </Project> |
diff --git a/src/wix/Directory.Build.targets b/src/wix/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/wix/Directory.Build.targets +++ /dev/null | |||
| @@ -1,51 +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 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
| 14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
| 15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <Choose> | ||
| 19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
| 20 | |||
| 21 | <PropertyGroup> | ||
| 22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
| 23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
| 24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
| 25 | </PropertyGroup> | ||
| 26 | |||
| 27 | <ItemGroup> | ||
| 28 | <!-- Keep the identity of the PackageReference --> | ||
| 29 | <SmartPackageReference Include="@(PackageReference)"> | ||
| 30 | <PackageName>%(Identity)</PackageName> | ||
| 31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
| 32 | </SmartPackageReference> | ||
| 33 | |||
| 34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
| 35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
| 36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
| 37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
| 38 | </PackageInSolution> | ||
| 39 | |||
| 40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
| 41 | |||
| 42 | <!-- Remove the package references that are now referenced as projects --> | ||
| 43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/> | ||
| 44 | </ItemGroup> | ||
| 45 | |||
| 46 | </When> | ||
| 47 | </Choose> | ||
| 48 | |||
| 49 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
| 50 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
| 51 | </Project> | ||
diff --git a/src/wix/Directory.csproj.props b/src/wix/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/wix/Directory.csproj.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/wix/Directory.csproj.targets b/src/wix/Directory.csproj.targets deleted file mode 100644 index c3270426..00000000 --- a/src/wix/Directory.csproj.targets +++ /dev/null | |||
| @@ -1,26 +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\Directory.csproj.targets | ||
| 4 | then update all of the repos. | ||
| 5 | --> | ||
| 6 | <Project> | ||
| 7 | <PropertyGroup> | ||
| 8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
| 9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 10 | </PropertyGroup> | ||
| 11 | |||
| 12 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
| 13 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
| 14 | <PropertyGroup> | ||
| 15 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
| 16 | |||
| 17 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| 18 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath> | ||
| 19 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
| 20 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
| 21 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| 22 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| 23 | </PropertyGroup> | ||
| 24 | </Target> | ||
| 25 | |||
| 26 | </Project> | ||
diff --git a/src/wix/Directory.vcxproj.props b/src/wix/Directory.vcxproj.props deleted file mode 100644 index bcf26c57..00000000 --- a/src/wix/Directory.vcxproj.props +++ /dev/null | |||
| @@ -1,111 +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 | |||
| 10 | <!-- NBGV properties --> | ||
| 11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
| 12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
| 13 | |||
| 14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
| 15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
| 16 | </PropertyGroup> | ||
| 17 | |||
| 18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
| 19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 20 | </PropertyGroup> | ||
| 21 | |||
| 22 | <ItemDefinitionGroup> | ||
| 23 | <ClCompile> | ||
| 24 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
| 25 | <WarningLevel>Level4</WarningLevel> | ||
| 26 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 27 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 28 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
| 29 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
| 30 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
| 31 | <TreatWarningAsError>true</TreatWarningAsError> | ||
| 32 | <ExceptionHandling>false</ExceptionHandling> | ||
| 33 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
| 34 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
| 35 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
| 36 | </ClCompile> | ||
| 37 | <ResourceCompile> | ||
| 38 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 39 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 40 | </ResourceCompile> | ||
| 41 | <Lib> | ||
| 42 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 43 | </Lib> | ||
| 44 | <Link> | ||
| 45 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
| 46 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
| 47 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
| 48 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 49 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 50 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
| 51 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
| 52 | </Link> | ||
| 53 | </ItemDefinitionGroup> | ||
| 54 | |||
| 55 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
| 56 | <ClCompile> | ||
| 57 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
| 58 | </ClCompile> | ||
| 59 | </ItemDefinitionGroup> | ||
| 60 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
| 61 | <ClCompile> | ||
| 62 | <CallingConvention>CDecl</CallingConvention> | ||
| 63 | </ClCompile> | ||
| 64 | </ItemDefinitionGroup> | ||
| 65 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
| 66 | <ClCompile> | ||
| 67 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 68 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
| 69 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
| 70 | </ClCompile> | ||
| 71 | </ItemDefinitionGroup> | ||
| 72 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
| 73 | <ClCompile> | ||
| 74 | <Optimization>Disabled</Optimization> | ||
| 75 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| 76 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 77 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 78 | </ClCompile> | ||
| 79 | </ItemDefinitionGroup> | ||
| 80 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | ||
| 81 | <ClCompile> | ||
| 82 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 83 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | ||
| 84 | </ClCompile> | ||
| 85 | </ItemDefinitionGroup> | ||
| 86 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
| 87 | <ClCompile> | ||
| 88 | <Optimization>MinSpace</Optimization> | ||
| 89 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 90 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 91 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| 92 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 93 | </ClCompile> | ||
| 94 | <Link> | ||
| 95 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 96 | <OptimizeReferences>true</OptimizeReferences> | ||
| 97 | </Link> | ||
| 98 | </ItemDefinitionGroup> | ||
| 99 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | ||
| 100 | <ClCompile> | ||
| 101 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
| 102 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | ||
| 103 | </ClCompile> | ||
| 104 | </ItemDefinitionGroup> | ||
| 105 | <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' "> | ||
| 106 | <Link> | ||
| 107 | <KeyFile>$(LinkKeyFile)</KeyFile> | ||
| 108 | <DelaySign>$(LinkDelaySign)</DelaySign> | ||
| 109 | </Link> | ||
| 110 | </ItemDefinitionGroup> | ||
| 111 | </Project> | ||
diff --git a/src/wix/Directory.wixproj.props b/src/wix/Directory.wixproj.props deleted file mode 100644 index a0aaa658..00000000 --- a/src/wix/Directory.wixproj.props +++ /dev/null | |||
| @@ -1,14 +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 | <DefineConstants>$(DefineConstants);CompanyName=$(Company)</DefineConstants> | ||
| 7 | </PropertyGroup> | ||
| 8 | |||
| 9 | <ItemGroup> | ||
| 10 | <BindInputPaths Include="$(OutputPath)Win32\" /> | ||
| 11 | </ItemGroup> | ||
| 12 | |||
| 13 | <Import Project="$(OutputPath)\publish\WixToolset.Sdk\build\WixToolset.Sdk.props" /> | ||
| 14 | </Project> | ||
diff --git a/src/wix/README-CoreNative.md b/src/wix/README-CoreNative.md deleted file mode 100644 index 787123cc..00000000 --- a/src/wix/README-CoreNative.md +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | # Core.Native | ||
| 2 | Core.Native - native component of WixToolset.Core | ||
diff --git a/src/wix/README-Tools.md b/src/wix/README-Tools.md deleted file mode 100644 index a806dbde..00000000 --- a/src/wix/README-Tools.md +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | # Tools | ||
| 2 | |||
| 3 | Command line tools and MSBuild integration | ||
| 4 | |||
diff --git a/src/wix/README.md b/src/wix/README.md index 622cd3f9..209f927e 100644 --- a/src/wix/README.md +++ b/src/wix/README.md | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # Core | 1 | # Core |
| 2 | WixToolset.Core - preprocessor, compiler, linker and binder for Windows Installer and Burn | 2 | |
| 3 | Preprocessor, compiler, linker and binder for Windows Installer and Burn | ||
| 3 | 4 | ||
diff --git a/src/wix/Tools.sln b/src/wix/Tools.sln deleted file mode 100644 index 23f8a4d9..00000000 --- a/src/wix/Tools.sln +++ /dev/null | |||
| @@ -1,105 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 16 | ||
| 4 | VisualStudioVersion = 16.0.30011.22 | ||
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | ||
| 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BuildTasks", "src\test\WixToolsetTest.BuildTasks\WixToolsetTest.BuildTasks.csproj", "{4B0098A4-B581-4D04-BA1E-6DC2370A7D43}" | ||
| 7 | EndProject | ||
| 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wix", "src\wix\wix.csproj", "{DA5CA026-6165-48C4-BDA5-BB4B17D56A18}" | ||
| 9 | EndProject | ||
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BuildTasks", "src\WixToolset.BuildTasks\WixToolset.BuildTasks.csproj", "{65141CE1-0BDD-41EF-8043-35B96C423CB6}" | ||
| 11 | EndProject | ||
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-wix", "src\dotnet-wix\dotnet-wix.csproj", "{938BCA04-610B-4B99-9CB7-02BF7397A972}" | ||
| 13 | EndProject | ||
| 14 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Sdk", "src\WixToolset.Sdk\WixToolset.Sdk.csproj", "{0DF5D4CF-8457-469D-8288-13775E984F70}" | ||
| 15 | EndProject | ||
| 16 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{449BE9B0-422F-4039-A030-BDD3E7D97878}" | ||
| 17 | ProjectSection(SolutionItems) = preProject | ||
| 18 | .editorconfig = .editorconfig | ||
| 19 | EndProjectSection | ||
| 20 | EndProject | ||
| 21 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thmviewer", "src\thmviewer\thmviewer.vcxproj", "{95228C13-97F5-484A-B4A2-ECF4618B0881}" | ||
| 22 | EndProject | ||
| 23 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "heat", "src\heat\heat.csproj", "{B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}" | ||
| 24 | EndProject | ||
| 25 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Sdk", "src\test\WixToolsetTest.Sdk\WixToolsetTest.Sdk.csproj", "{7B610B7B-C69D-4A4C-9D65-F304C44479E7}" | ||
| 26 | EndProject | ||
| 27 | Global | ||
| 28 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 29 | Debug|Any CPU = Debug|Any CPU | ||
| 30 | Debug|x86 = Debug|x86 | ||
| 31 | Release|Any CPU = Release|Any CPU | ||
| 32 | Release|x86 = Release|x86 | ||
| 33 | EndGlobalSection | ||
| 34 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 35 | {4B0098A4-B581-4D04-BA1E-6DC2370A7D43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 36 | {4B0098A4-B581-4D04-BA1E-6DC2370A7D43}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 37 | {4B0098A4-B581-4D04-BA1E-6DC2370A7D43}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 38 | {4B0098A4-B581-4D04-BA1E-6DC2370A7D43}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 39 | {4B0098A4-B581-4D04-BA1E-6DC2370A7D43}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 40 | {4B0098A4-B581-4D04-BA1E-6DC2370A7D43}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 41 | {4B0098A4-B581-4D04-BA1E-6DC2370A7D43}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 42 | {4B0098A4-B581-4D04-BA1E-6DC2370A7D43}.Release|x86.Build.0 = Release|Any CPU | ||
| 43 | {DA5CA026-6165-48C4-BDA5-BB4B17D56A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 44 | {DA5CA026-6165-48C4-BDA5-BB4B17D56A18}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 45 | {DA5CA026-6165-48C4-BDA5-BB4B17D56A18}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 46 | {DA5CA026-6165-48C4-BDA5-BB4B17D56A18}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 47 | {DA5CA026-6165-48C4-BDA5-BB4B17D56A18}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 48 | {DA5CA026-6165-48C4-BDA5-BB4B17D56A18}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 49 | {DA5CA026-6165-48C4-BDA5-BB4B17D56A18}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 50 | {DA5CA026-6165-48C4-BDA5-BB4B17D56A18}.Release|x86.Build.0 = Release|Any CPU | ||
| 51 | {65141CE1-0BDD-41EF-8043-35B96C423CB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 52 | {65141CE1-0BDD-41EF-8043-35B96C423CB6}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 53 | {65141CE1-0BDD-41EF-8043-35B96C423CB6}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 54 | {65141CE1-0BDD-41EF-8043-35B96C423CB6}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 55 | {65141CE1-0BDD-41EF-8043-35B96C423CB6}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 56 | {65141CE1-0BDD-41EF-8043-35B96C423CB6}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 57 | {65141CE1-0BDD-41EF-8043-35B96C423CB6}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 58 | {65141CE1-0BDD-41EF-8043-35B96C423CB6}.Release|x86.Build.0 = Release|Any CPU | ||
| 59 | {938BCA04-610B-4B99-9CB7-02BF7397A972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 60 | {938BCA04-610B-4B99-9CB7-02BF7397A972}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 61 | {938BCA04-610B-4B99-9CB7-02BF7397A972}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 62 | {938BCA04-610B-4B99-9CB7-02BF7397A972}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 63 | {938BCA04-610B-4B99-9CB7-02BF7397A972}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 64 | {938BCA04-610B-4B99-9CB7-02BF7397A972}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 65 | {938BCA04-610B-4B99-9CB7-02BF7397A972}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 66 | {938BCA04-610B-4B99-9CB7-02BF7397A972}.Release|x86.Build.0 = Release|Any CPU | ||
| 67 | {0DF5D4CF-8457-469D-8288-13775E984F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 68 | {0DF5D4CF-8457-469D-8288-13775E984F70}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 69 | {0DF5D4CF-8457-469D-8288-13775E984F70}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 70 | {0DF5D4CF-8457-469D-8288-13775E984F70}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 71 | {0DF5D4CF-8457-469D-8288-13775E984F70}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 72 | {0DF5D4CF-8457-469D-8288-13775E984F70}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 73 | {0DF5D4CF-8457-469D-8288-13775E984F70}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 74 | {0DF5D4CF-8457-469D-8288-13775E984F70}.Release|x86.Build.0 = Release|Any CPU | ||
| 75 | {95228C13-97F5-484A-B4A2-ECF4618B0881}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 76 | {95228C13-97F5-484A-B4A2-ECF4618B0881}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
| 77 | {95228C13-97F5-484A-B4A2-ECF4618B0881}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 78 | {95228C13-97F5-484A-B4A2-ECF4618B0881}.Debug|x86.Build.0 = Debug|Win32 | ||
| 79 | {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 80 | {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|x86.ActiveCfg = Release|Win32 | ||
| 81 | {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|x86.Build.0 = Release|Win32 | ||
| 82 | {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 83 | {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 84 | {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 85 | {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 86 | {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 87 | {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 88 | {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 89 | {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|x86.Build.0 = Release|Any CPU | ||
| 90 | {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 91 | {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 92 | {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 93 | {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 94 | {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 95 | {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 96 | {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 97 | {7B610B7B-C69D-4A4C-9D65-F304C44479E7}.Release|x86.Build.0 = Release|Any CPU | ||
| 98 | EndGlobalSection | ||
| 99 | GlobalSection(SolutionProperties) = preSolution | ||
| 100 | HideSolutionNode = FALSE | ||
| 101 | EndGlobalSection | ||
| 102 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 103 | SolutionGuid = {AEB88B8C-8C84-4E97-9886-30CBDD32B34B} | ||
| 104 | EndGlobalSection | ||
| 105 | EndGlobal | ||
diff --git a/src/wix/Tools.v3.ncrunchsolution b/src/wix/Tools.v3.ncrunchsolution deleted file mode 100644 index 10420ac9..00000000 --- a/src/wix/Tools.v3.ncrunchsolution +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | <SolutionConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <AllowParallelTestExecution>True</AllowParallelTestExecution> | ||
| 4 | <SolutionConfigured>True</SolutionConfigured> | ||
| 5 | </Settings> | ||
| 6 | </SolutionConfiguration> \ No newline at end of file | ||
diff --git a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index 3a1c7f4c..64a82e98 100644 --- a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | |||
| @@ -8,32 +8,27 @@ | |||
| 8 | <Title>WiX Toolset MSBuild Tasks</Title> | 8 | <Title>WiX Toolset MSBuild Tasks</Title> |
| 9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
| 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 11 | <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86</RuntimeIdentifier> | 11 | <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86;win-x64</RuntimeIdentifiers> |
| 12 | <!-- https://github.com/Microsoft/msbuild/issues/2360 --> | 12 | <!-- https://github.com/Microsoft/msbuild/issues/2360 --> |
| 13 | <PlatformTarget>AnyCPU</PlatformTarget> | 13 | <PlatformTarget>AnyCPU</PlatformTarget> |
| 14 | </PropertyGroup> | 14 | </PropertyGroup> |
| 15 | 15 | ||
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" /> | 17 | <PackageReference Include="WixToolset.Dtf.WindowsInstaller" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | 19 | ||
| 20 | <ItemGroup Condition="'$(TargetFramework)'=='net461'"> | 20 | <ItemGroup Condition="'$(TargetFramework)'=='net461'"> |
| 21 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" /> | 21 | <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" /> |
| 22 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 22 | <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" /> |
| 23 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | 23 | <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" /> |
| 24 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | 24 | <PackageReference Include="Microsoft.Build.Tasks.Core" /> |
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | 26 | ||
| 27 | <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'"> | 27 | <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'"> |
| 28 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" /> | 28 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> |
| 29 | </ItemGroup> | 29 | </ItemGroup> |
| 30 | 30 | ||
| 31 | <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' "> | 31 | <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' "> |
| 32 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" /> | 32 | <PackageReference Include="Microsoft.Build.Tasks.Core" /> |
| 33 | </ItemGroup> | ||
| 34 | |||
| 35 | <ItemGroup> | ||
| 36 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 37 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 38 | </ItemGroup> | 33 | </ItemGroup> |
| 39 | </Project> | 34 | </Project> |
diff --git a/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj b/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj index 445c3500..42e60ebb 100644 --- a/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj +++ b/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj | |||
| @@ -21,12 +21,11 @@ | |||
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | 22 | ||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
| 24 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 24 | <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" IncludeAssets="true" /> |
| 25 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | 25 | <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" IncludeAssets="true" /> |
| 26 | </ItemGroup> | 26 | </ItemGroup> |
| 27 | 27 | ||
| 28 | <ItemGroup> | 28 | <ItemGroup> |
| 29 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 29 | <PackageReference Include="WixToolset.Data" /> |
| 30 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 31 | </ItemGroup> | 30 | </ItemGroup> |
| 32 | </Project> | 31 | </Project> |
diff --git a/src/wix/WixToolset.Converters.sln b/src/wix/WixToolset.Converters.sln deleted file mode 100644 index ae8a3d92..00000000 --- a/src/wix/WixToolset.Converters.sln +++ /dev/null | |||
| @@ -1,85 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio 15 | ||
| 4 | VisualStudioVersion = 15.0.26124.0 | ||
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | ||
| 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Converters", "WixToolset.Converters\WixToolset.Converters.csproj", "{6FAF6385-6598-4B89-972B-C31AFCA14538}" | ||
| 7 | EndProject | ||
| 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Converters.Symbolizer", "WixToolset.Converters.Symbolizer\WixToolset.Converters.Symbolizer.csproj", "{F051BCAF-698C-41D5-8427-164537CE5C5C}" | ||
| 9 | EndProject | ||
| 10 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{1B16A6C1-2B5D-4F9A-9DD5-FBC89B3CE31E}" | ||
| 11 | EndProject | ||
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Converters", "test\WixToolsetTest.Converters\WixToolsetTest.Converters.csproj", "{485C5038-97E1-4729-A54D-848CC69569FD}" | ||
| 13 | EndProject | ||
| 14 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Converters.Symbolizer", "test\WixToolsetTest.Converters.Symbolizer\WixToolsetTest.Converters.Symbolizer.csproj", "{9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}" | ||
| 15 | EndProject | ||
| 16 | Global | ||
| 17 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 18 | Debug|Any CPU = Debug|Any CPU | ||
| 19 | Debug|x64 = Debug|x64 | ||
| 20 | Debug|x86 = Debug|x86 | ||
| 21 | Release|Any CPU = Release|Any CPU | ||
| 22 | Release|x64 = Release|x64 | ||
| 23 | Release|x86 = Release|x86 | ||
| 24 | EndGlobalSection | ||
| 25 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 26 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 27 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 28 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 29 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 30 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 31 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 32 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 33 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 34 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 35 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x64.Build.0 = Release|Any CPU | ||
| 36 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 37 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x86.Build.0 = Release|Any CPU | ||
| 38 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 39 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 40 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 41 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 42 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 43 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 44 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 45 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 46 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 47 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x64.Build.0 = Release|Any CPU | ||
| 48 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 49 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x86.Build.0 = Release|Any CPU | ||
| 50 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 51 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 52 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 53 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 54 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 55 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 56 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 57 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 58 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 59 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x64.Build.0 = Release|Any CPU | ||
| 60 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 61 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x86.Build.0 = Release|Any CPU | ||
| 62 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 63 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 64 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 65 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 66 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 67 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 68 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 69 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 70 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 71 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x64.Build.0 = Release|Any CPU | ||
| 72 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 73 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x86.Build.0 = Release|Any CPU | ||
| 74 | EndGlobalSection | ||
| 75 | GlobalSection(SolutionProperties) = preSolution | ||
| 76 | HideSolutionNode = FALSE | ||
| 77 | EndGlobalSection | ||
| 78 | GlobalSection(NestedProjects) = preSolution | ||
| 79 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C} = {1B16A6C1-2B5D-4F9A-9DD5-FBC89B3CE31E} | ||
| 80 | {485C5038-97E1-4729-A54D-848CC69569FD} = {1B16A6C1-2B5D-4F9A-9DD5-FBC89B3CE31E} | ||
| 81 | EndGlobalSection | ||
| 82 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 83 | SolutionGuid = {2E71F0EC-CF75-44DA-8353-7066EBD06564} | ||
| 84 | EndGlobalSection | ||
| 85 | EndGlobal | ||
diff --git a/src/wix/WixToolset.Converters.v3.ncrunchsolution b/src/wix/WixToolset.Converters.v3.ncrunchsolution deleted file mode 100644 index f774ab93..00000000 --- a/src/wix/WixToolset.Converters.v3.ncrunchsolution +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | <SolutionConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <AllowParallelTestExecution>False</AllowParallelTestExecution> | ||
| 4 | <SolutionConfigured>True</SolutionConfigured> | ||
| 5 | </Settings> | ||
| 6 | </SolutionConfiguration> \ No newline at end of file | ||
diff --git a/src/wix/WixToolset.Converters/WixToolset.Converters.csproj b/src/wix/WixToolset.Converters/WixToolset.Converters.csproj index 7dddefa5..65c0134a 100644 --- a/src/wix/WixToolset.Converters/WixToolset.Converters.csproj +++ b/src/wix/WixToolset.Converters/WixToolset.Converters.csproj | |||
| @@ -14,11 +14,7 @@ | |||
| 14 | </PropertyGroup> | 14 | </PropertyGroup> |
| 15 | 15 | ||
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> | 17 | <PackageReference Include="WixToolset.Data" /> |
| 18 | </ItemGroup> | 18 | <PackageReference Include="WixToolset.Extensibility" /> |
| 19 | |||
| 20 | <ItemGroup> | ||
| 21 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 22 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 23 | </ItemGroup> | 19 | </ItemGroup> |
| 24 | </Project> | 20 | </Project> |
diff --git a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj index f2da8a50..3527b85a 100644 --- a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj +++ b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj | |||
| @@ -25,15 +25,14 @@ | |||
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | 26 | ||
| 27 | <ItemGroup> | 27 | <ItemGroup> |
| 28 | <PackageReference Include="WixToolset.Burn" Version="4.0.*" /> | 28 | <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" /> |
| 29 | <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" /> | 29 | <ProjectReference Include="..\WixToolset.Core.Native\WixToolset.Core.Native.csproj" /> |
| 30 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | ||
| 31 | <PackageReference Include="WixToolset.Dtf.Resources" Version="4.0.*" /> | ||
| 32 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> | ||
| 33 | </ItemGroup> | 30 | </ItemGroup> |
| 34 | 31 | ||
| 35 | <ItemGroup> | 32 | <ItemGroup> |
| 36 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 33 | <PackageReference Include="WixToolset.Burn" /> |
| 37 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 34 | <PackageReference Include="WixToolset.Data" /> |
| 35 | <PackageReference Include="WixToolset.Dtf.Resources" /> | ||
| 36 | <PackageReference Include="WixToolset.Extensibility" /> | ||
| 38 | </ItemGroup> | 37 | </ItemGroup> |
| 39 | </Project> | 38 | </Project> |
diff --git a/src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj b/src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj index 1383305c..61dce8b0 100644 --- a/src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj +++ b/src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj | |||
| @@ -13,17 +13,12 @@ | |||
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | 16 | <PackageReference Include="WixToolset.Data" /> |
| 17 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> | 17 | <PackageReference Include="WixToolset.Extensibility" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | 19 | ||
| 20 | <ItemGroup> | 20 | <ItemGroup> |
| 21 | <PackageReference Include="NuGet.Credentials" Version="5.6.0" /> | 21 | <PackageReference Include="NuGet.Credentials" /> |
| 22 | <PackageReference Include="NuGet.Protocol" Version="5.6.0" /> | 22 | <PackageReference Include="NuGet.Protocol" /> |
| 23 | </ItemGroup> | ||
| 24 | |||
| 25 | <ItemGroup> | ||
| 26 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 27 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 28 | </ItemGroup> | 23 | </ItemGroup> |
| 29 | </Project> | 24 | </Project> |
diff --git a/src/wix/WixToolset.Core.Native.sln b/src/wix/WixToolset.Core.Native.sln deleted file mode 100644 index 0d7a5921..00000000 --- a/src/wix/WixToolset.Core.Native.sln +++ /dev/null | |||
| @@ -1,63 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio 15 | ||
| 4 | VisualStudioVersion = 15.0.27004.2009 | ||
| 5 | MinimumVisualStudioVersion = 15.0.26124.0 | ||
| 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.Native", "src\WixToolset.Core.Native\WixToolset.Core.Native.csproj", "{C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}" | ||
| 7 | EndProject | ||
| 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixnative", "src\wixnative\wixnative.vcxproj", "{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}" | ||
| 9 | EndProject | ||
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Core.Native", "src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj", "{54F5329A-C113-471A-8EE1-83021E8A4853}" | ||
| 11 | EndProject | ||
| 12 | Global | ||
| 13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 14 | Debug|Any CPU = Debug|Any CPU | ||
| 15 | Debug|x64 = Debug|x64 | ||
| 16 | Debug|x86 = Debug|x86 | ||
| 17 | Release|Any CPU = Release|Any CPU | ||
| 18 | Release|x64 = Release|x64 | ||
| 19 | Release|x86 = Release|x86 | ||
| 20 | EndGlobalSection | ||
| 21 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 22 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 23 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 24 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 25 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 26 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 27 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 28 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 29 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 30 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 31 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|x64.Build.0 = Release|Any CPU | ||
| 32 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 33 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|x86.Build.0 = Release|Any CPU | ||
| 34 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 35 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 36 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x64.Build.0 = Debug|x64 | ||
| 37 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 38 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x86.Build.0 = Debug|Win32 | ||
| 39 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 40 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x64.ActiveCfg = Release|x64 | ||
| 41 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x64.Build.0 = Release|x64 | ||
| 42 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x86.ActiveCfg = Release|Win32 | ||
| 43 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x86.Build.0 = Release|Win32 | ||
| 44 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 45 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 46 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 47 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 48 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 49 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 50 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 51 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 52 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 53 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|x64.Build.0 = Release|Any CPU | ||
| 54 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 55 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|x86.Build.0 = Release|Any CPU | ||
| 56 | EndGlobalSection | ||
| 57 | GlobalSection(SolutionProperties) = preSolution | ||
| 58 | HideSolutionNode = FALSE | ||
| 59 | EndGlobalSection | ||
| 60 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 61 | SolutionGuid = {1E952530-A3ED-4E65-AF39-9025EFB85322} | ||
| 62 | EndGlobalSection | ||
| 63 | EndGlobal | ||
diff --git a/src/wix/WixToolset.Core.Native.v3.ncrunchsolution b/src/wix/WixToolset.Core.Native.v3.ncrunchsolution deleted file mode 100644 index 10420ac9..00000000 --- a/src/wix/WixToolset.Core.Native.v3.ncrunchsolution +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | <SolutionConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <AllowParallelTestExecution>True</AllowParallelTestExecution> | ||
| 4 | <SolutionConfigured>True</SolutionConfigured> | ||
| 5 | </Settings> | ||
| 6 | </SolutionConfiguration> \ No newline at end of file | ||
diff --git a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj index fea15922..136e1615 100644 --- a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj +++ b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj | |||
| @@ -20,30 +20,26 @@ | |||
| 20 | 20 | ||
| 21 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | 21 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
| 22 | <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=ARM64" /> | 22 | <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=ARM64" /> |
| 23 | <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=Win32" /> | 23 | <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=x86" /> |
| 24 | <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=x64" /> | 24 | <ProjectReference Include="..\wixnative\wixnative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=x64" /> |
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | 26 | ||
| 27 | <!-- Copy the x86 binaries for unittests (especially CI) but use x64 binaries when in NCrunch --> | ||
| 27 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | 28 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
| 28 | <None Include="$(BaseOutputPath)$(Configuration)\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" /> | 29 | <None Include="..\wixnative\Win32\mergemod.dll" CopyToOutputDirectory="PreserveNewest" /> |
| 29 | <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" /> | 30 | <None Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" CopyToOutputDirectory="PreserveNewest" /> |
| 30 | <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.pdb" CopyToOutputDirectory="PreserveNewest" /> | 31 | <None Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.pdb" CopyToOutputDirectory="PreserveNewest" /> |
| 31 | </ItemGroup> | 32 | </ItemGroup> |
| 32 | <ItemGroup Condition=" '$(NCrunch)'=='1' "> | 33 | <ItemGroup Condition=" '$(NCrunch)'=='1' "> |
| 33 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(Configuration)\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" /> | 34 | <None Include="$(NCrunchOriginalProjectDir)..\wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" /> |
| 34 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" /> | 35 | <None Include="$(NCrunchOriginalProjectDir)..\..\..\build\$(SegmentName)\$(Configuration)\x86\wixnative.exe" CopyToOutputDirectory="PreserveNewest" /> |
| 35 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(Configuration)\x64\wixnative.pdb" CopyToOutputDirectory="PreserveNewest" /> | 36 | <None Include="$(NCrunchOriginalProjectDir)..\..\..\build\$(SegmentName)\$(Configuration)\x86\wixnative.pdb" CopyToOutputDirectory="PreserveNewest" /> |
| 36 | </ItemGroup> | 37 | </ItemGroup> |
| 37 | 38 | ||
| 38 | <ItemGroup> | 39 | <ItemGroup> |
| 39 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | 40 | <PackageReference Include="WixToolset.Data" /> |
| 40 | 41 | ||
| 41 | <!-- Warning: The version for System.IO.FileSystem.AccessControl must be kept in sync with WixToolset.Core.nuspec --> | 42 | <!-- Warning: The version for System.IO.FileSystem.AccessControl must be kept in sync with WixToolset.Core.nuspec --> |
| 42 | <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0" /> | 43 | <PackageReference Include="System.IO.FileSystem.AccessControl" /> |
| 43 | </ItemGroup> | ||
| 44 | |||
| 45 | <ItemGroup> | ||
| 46 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" /> | ||
| 47 | <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="all" /> | ||
| 48 | </ItemGroup> | 44 | </ItemGroup> |
| 49 | </Project> | 45 | </Project> |
diff --git a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec index 3091ccd5..ae5c7c61 100644 --- a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec +++ b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | |||
| @@ -19,23 +19,24 @@ | |||
| 19 | </metadata> | 19 | </metadata> |
| 20 | 20 | ||
| 21 | <files> | 21 | <files> |
| 22 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> | 22 | <file src="$id$.dll" target="lib\netstandard2.0" /> |
| 23 | <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" /> | 23 | <file src="$id$.xml" target="lib\netstandard2.0" /> |
| 24 | 24 | ||
| 25 | <file src="netstandard2.0\cubes\darice.cub" target="lib\netstandard2.0\cubes" /> | 25 | <file src="$projectFolder$\cubes\darice.cub" target="lib\netstandard2.0\cubes" /> |
| 26 | <file src="netstandard2.0\cubes\mergemod.cub" target="lib\netstandard2.0\cubes" /> | 26 | <file src="$projectFolder$\cubes\mergemod.cub" target="lib\netstandard2.0\cubes" /> |
| 27 | 27 | ||
| 28 | <file src="netstandard2.0\targets\$id$.targets" target="build" /> | 28 | <file src="$projectFolder$\targets\$id$.targets" target="build" /> |
| 29 | <file src="netstandard2.0\targets\$id$.targets" target="buildTransitive" /> | 29 | <file src="$projectFolder$\targets\$id$.targets" target="buildTransitive" /> |
| 30 | 30 | ||
| 31 | <file src="ARM64\mergemod.dll" target="runtimes\win-arm64\native" /> | 31 | <file src="$projectFolder$\..\wixnative\ARM64\mergemod.dll" target="runtimes\win-arm64\native" /> |
| 32 | <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" /> | 32 | <file src="$projectFolder$\..\wixnative\Win32\mergemod.dll" target="runtimes\win-x86\native" /> |
| 33 | <file src="ARM64\wixnative.pdb" target="runtimes\win-arm64\native" /> | 33 | <file src="$projectFolder$\..\wixnative\x64\mergemod.dll" target="runtimes\win-x64\native" /> |
| 34 | <file src="Win32\mergemod.dll" target="runtimes\win-x86\native" /> | 34 | |
| 35 | <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" /> | 35 | <file src="..\ARM64\wixnative.exe" target="runtimes\win-arm64\native" /> |
| 36 | <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" /> | 36 | <file src="..\ARM64\wixnative.pdb" target="runtimes\win-arm64\native" /> |
| 37 | <file src="x64\mergemod.dll" target="runtimes\win-x64\native" /> | 37 | <file src="..\x86\wixnative.exe" target="runtimes\win-x86\native" /> |
| 38 | <file src="x64\wixnative.exe" target="runtimes\win-x64\native" /> | 38 | <file src="..\x86\wixnative.pdb" target="runtimes\win-x86\native" /> |
| 39 | <file src="x64\wixnative.pdb" target="runtimes\win-x64\native" /> | 39 | <file src="..\x64\wixnative.exe" target="runtimes\win-x64\native" /> |
| 40 | <file src="..\x64\wixnative.pdb" target="runtimes\win-x64\native" /> | ||
| 40 | </files> | 41 | </files> |
| 41 | </package> | 42 | </package> |
diff --git a/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj b/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj index b64b4075..82c60120 100644 --- a/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj +++ b/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj | |||
| @@ -9,26 +9,26 @@ | |||
| 9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
| 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 11 | <CreateDocumentationFile>true</CreateDocumentationFile> | 11 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 12 | <SignOutput>false</SignOutput> | ||
| 12 | </PropertyGroup> | 13 | </PropertyGroup> |
| 13 | 14 | ||
| 14 | <ItemGroup> | 15 | <ItemGroup> |
| 15 | <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" IncludeAssets="true" /> | 16 | <ProjectReference Include="..\WixToolset.Core.Native\WixToolset.Core.Native.csproj" PrivateAssets="true" /> |
| 16 | <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" IncludeAssets="true" /> | 17 | <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" PrivateAssets="true" /> |
| 17 | <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" IncludeAssets="true" /> | 18 | <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" PrivateAssets="true" /> |
| 19 | <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" PrivateAssets="true" /> | ||
| 18 | </ItemGroup> | 20 | </ItemGroup> |
| 19 | 21 | ||
| 20 | <ItemGroup> | 22 | <ItemGroup> |
| 21 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | 23 | <PackageReference Include="WixToolset.Data" /> |
| 22 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> | 24 | <PackageReference Include="WixToolset.Extensibility" /> |
| 23 | <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" /> | ||
| 24 | </ItemGroup> | 25 | </ItemGroup> |
| 25 | 26 | ||
| 26 | <ItemGroup> | 27 | <ItemGroup> |
| 27 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 28 | <PackageReference Include="WixBuildTools.TestSupport" /> |
| 28 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 29 | </ItemGroup> | 29 | </ItemGroup> |
| 30 | 30 | ||
| 31 | <ItemGroup> | 31 | <ItemGroup> |
| 32 | <PackageReference Include="xunit.assert" Version="2.4.0" /> | 32 | <PackageReference Include="xunit.assert" /> |
| 33 | </ItemGroup> | 33 | </ItemGroup> |
| 34 | </Project> | 34 | </Project> |
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj b/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj index b08f337f..65f4e4ca 100644 --- a/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj +++ b/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj | |||
| @@ -13,18 +13,16 @@ | |||
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" /> | 16 | <ProjectReference Include="..\WixToolset.Core.Native\WixToolset.Core.Native.csproj" /> |
| 17 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | ||
| 18 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> | ||
| 19 | </ItemGroup> | 17 | </ItemGroup> |
| 20 | 18 | ||
| 21 | <ItemGroup> | 19 | <ItemGroup> |
| 22 | <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" /> | 20 | <PackageReference Include="WixToolset.Data" /> |
| 23 | <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" /> | 21 | <PackageReference Include="WixToolset.Extensibility" /> |
| 24 | </ItemGroup> | 22 | </ItemGroup> |
| 25 | 23 | ||
| 26 | <ItemGroup> | 24 | <ItemGroup> |
| 27 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 25 | <PackageReference Include="System.Reflection.Metadata" /> |
| 28 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | 26 | <PackageReference Include="System.Text.Encoding.CodePages" /> |
| 29 | </ItemGroup> | 27 | </ItemGroup> |
| 30 | </Project> | 28 | </Project> |
diff --git a/src/wix/WixToolset.Core.sln b/src/wix/WixToolset.Core.sln deleted file mode 100644 index 523c960e..00000000 --- a/src/wix/WixToolset.Core.sln +++ /dev/null | |||
| @@ -1,156 +0,0 @@ | |||
| 1 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 2 | # Visual Studio 15 | ||
| 3 | VisualStudioVersion = 15.0.27004.2009 | ||
| 4 | MinimumVisualStudioVersion = 15.0.26124.0 | ||
| 5 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core", "src\WixToolset.Core\WixToolset.Core.csproj", "{0B524850-5B9A-472B-85CC-D25920A1DFE1}" | ||
| 6 | EndProject | ||
| 7 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.WindowsInstaller", "src\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj", "{5617F2A7-46A0-4D07-B9E0-E982D15641E4}" | ||
| 8 | EndProject | ||
| 9 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.Burn", "src\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj", "{BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}" | ||
| 10 | EndProject | ||
| 11 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.ExtensionCache", "src\WixToolset.Core.ExtensionCache\WixToolset.Core.ExtensionCache.csproj", "{A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}" | ||
| 12 | EndProject | ||
| 13 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{1284331E-BC6C-426D-AAAF-140C0174F875}" | ||
| 14 | EndProject | ||
| 15 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.Extension", "src\test\Example.Extension\Example.Extension.csproj", "{C66C2503-C671-4230-8B48-1D93A8532A28}" | ||
| 16 | EndProject | ||
| 17 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.CoreIntegration", "src\test\WixToolsetTest.CoreIntegration\WixToolsetTest.CoreIntegration.csproj", "{E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}" | ||
| 18 | EndProject | ||
| 19 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Core.Burn", "src\test\WixToolsetTest.Core.Burn\WixToolsetTest.Core.Burn.csproj", "{DF63F589-028E-45A1-A212-948FACF1FDCD}" | ||
| 20 | EndProject | ||
| 21 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.TestPackage", "src\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj", "{853716DB-C02C-41BD-91BC-79CDC0C17D10}" | ||
| 22 | EndProject | ||
| 23 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompileCoreTestExtensionWixlib", "src\test\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj", "{23FC60D7-B101-42F8-9786-DB7A9CD964A2}" | ||
| 24 | EndProject | ||
| 25 | Global | ||
| 26 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 27 | Debug|Any CPU = Debug|Any CPU | ||
| 28 | Debug|x64 = Debug|x64 | ||
| 29 | Debug|x86 = Debug|x86 | ||
| 30 | Release|Any CPU = Release|Any CPU | ||
| 31 | Release|x64 = Release|x64 | ||
| 32 | Release|x86 = Release|x86 | ||
| 33 | EndGlobalSection | ||
| 34 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 35 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 36 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 37 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 38 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 39 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 40 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 41 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 42 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 43 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 44 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|x64.Build.0 = Release|Any CPU | ||
| 45 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 46 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|x86.Build.0 = Release|Any CPU | ||
| 47 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 48 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 49 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 50 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 51 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 52 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 53 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 54 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 55 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 56 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|x64.Build.0 = Release|Any CPU | ||
| 57 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 58 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|x86.Build.0 = Release|Any CPU | ||
| 59 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 60 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 61 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 62 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 63 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 64 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 65 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 66 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 67 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 68 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x64.Build.0 = Release|Any CPU | ||
| 69 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 70 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x86.Build.0 = Release|Any CPU | ||
| 71 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 72 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 73 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 74 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 75 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 76 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 77 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 78 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 79 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 80 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|x64.Build.0 = Release|Any CPU | ||
| 81 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 82 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|x86.Build.0 = Release|Any CPU | ||
| 83 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 84 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 85 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 86 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 87 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 88 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 89 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 90 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 91 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 92 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|x64.Build.0 = Release|Any CPU | ||
| 93 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 94 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|x86.Build.0 = Release|Any CPU | ||
| 95 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 96 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 97 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 98 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 99 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 100 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 101 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 102 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 103 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 104 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x64.Build.0 = Release|Any CPU | ||
| 105 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 106 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x86.Build.0 = Release|Any CPU | ||
| 107 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 108 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 109 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 110 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 111 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 112 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 113 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 114 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 115 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 116 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|x64.Build.0 = Release|Any CPU | ||
| 117 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 118 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|x86.Build.0 = Release|Any CPU | ||
| 119 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 120 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 121 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 122 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 123 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 124 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 125 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 126 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 127 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 128 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|x64.Build.0 = Release|Any CPU | ||
| 129 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 130 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|x86.Build.0 = Release|Any CPU | ||
| 131 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 132 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 133 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 134 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 135 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 136 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 137 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 138 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 139 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 140 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|x64.Build.0 = Release|Any CPU | ||
| 141 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 142 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|x86.Build.0 = Release|Any CPU | ||
| 143 | EndGlobalSection | ||
| 144 | GlobalSection(SolutionProperties) = preSolution | ||
| 145 | HideSolutionNode = FALSE | ||
| 146 | EndGlobalSection | ||
| 147 | GlobalSection(NestedProjects) = preSolution | ||
| 148 | {C66C2503-C671-4230-8B48-1D93A8532A28} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 149 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 150 | {DF63F589-028E-45A1-A212-948FACF1FDCD} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 151 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 152 | EndGlobalSection | ||
| 153 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 154 | SolutionGuid = {BB8820D5-723D-426D-B4A0-4D221603C5FA} | ||
| 155 | EndGlobalSection | ||
| 156 | EndGlobal | ||
diff --git a/src/wix/WixToolset.Core.v3.ncrunchsolution b/src/wix/WixToolset.Core.v3.ncrunchsolution deleted file mode 100644 index 10420ac9..00000000 --- a/src/wix/WixToolset.Core.v3.ncrunchsolution +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | <SolutionConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <AllowParallelTestExecution>True</AllowParallelTestExecution> | ||
| 4 | <SolutionConfigured>True</SolutionConfigured> | ||
| 5 | </Settings> | ||
| 6 | </SolutionConfiguration> \ No newline at end of file | ||
diff --git a/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs b/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs index 01a7d0e6..057126d4 100644 --- a/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs +++ b/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs | |||
| @@ -16,7 +16,12 @@ namespace WixToolset.Core.CommandLine | |||
| 16 | 16 | ||
| 17 | public Task<int> ExecuteAsync(CancellationToken cancellationToken) | 17 | public Task<int> ExecuteAsync(CancellationToken cancellationToken) |
| 18 | { | 18 | { |
| 19 | Console.WriteLine(ThisAssembly.AssemblyInformationalVersion); | 19 | // $(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(Commit) |
| 20 | Console.WriteLine("{0}.{1}.{2}{3}+{4}", ThisAssembly.Git.BaseVersion.Major | ||
| 21 | , ThisAssembly.Git.BaseVersion.Minor | ||
| 22 | , ThisAssembly.Git.BaseVersion.Patch | ||
| 23 | , ThisAssembly.Git.SemVer.DashLabel | ||
| 24 | , ThisAssembly.Git.Commit); | ||
| 20 | 25 | ||
| 21 | return Task.FromResult(0); | 26 | return Task.FromResult(0); |
| 22 | } | 27 | } |
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs index b0c87bcf..bcf516b6 100644 --- a/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs +++ b/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs | |||
| @@ -246,10 +246,10 @@ namespace WixToolset.Core.ExtensibilityServices | |||
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | case "WIXMAJORVERSION": | 248 | case "WIXMAJORVERSION": |
| 249 | return ThisAssembly.AssemblyFileVersion.Split('.')[0]; | 249 | return ThisAssembly.Git.BaseVersion.Major; |
| 250 | 250 | ||
| 251 | case "WIXVERSION": | 251 | case "WIXVERSION": |
| 252 | return ThisAssembly.AssemblyFileVersion; | 252 | return $"{ThisAssembly.Git.BaseVersion.Major}.{ThisAssembly.Git.BaseVersion.Minor}.{ThisAssembly.Git.BaseVersion.Patch}.{ThisAssembly.Git.Commits}"; |
| 253 | 253 | ||
| 254 | default: | 254 | default: |
| 255 | return null; | 255 | return null; |
diff --git a/src/wix/WixToolset.Core/WixToolset.Core.csproj b/src/wix/WixToolset.Core/WixToolset.Core.csproj index 7242d500..8f47eda3 100644 --- a/src/wix/WixToolset.Core/WixToolset.Core.csproj +++ b/src/wix/WixToolset.Core/WixToolset.Core.csproj | |||
| @@ -9,8 +9,9 @@ | |||
| 9 | <Title>WiX Toolset Core</Title> | 9 | <Title>WiX Toolset Core</Title> |
| 10 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
| 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 12 | <NBGV_EmitThisAssemblyClass>true</NBGV_EmitThisAssemblyClass> | ||
| 13 | <CreateDocumentationFile>true</CreateDocumentationFile> | 12 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 13 | |||
| 14 | <GitThisAssembly>true</GitThisAssembly> | ||
| 14 | </PropertyGroup> | 15 | </PropertyGroup> |
| 15 | 16 | ||
| 16 | <ItemGroup> | 17 | <ItemGroup> |
| @@ -26,9 +27,12 @@ | |||
| 26 | </ItemGroup> | 27 | </ItemGroup> |
| 27 | 28 | ||
| 28 | <ItemGroup> | 29 | <ItemGroup> |
| 29 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | 30 | <ProjectReference Include="..\WixToolset.Core.Native\WixToolset.Core.Native.csproj" /> |
| 30 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> | 31 | </ItemGroup> |
| 31 | <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" /> | 32 | |
| 33 | <ItemGroup> | ||
| 34 | <PackageReference Include="WixToolset.Data" /> | ||
| 35 | <PackageReference Include="WixToolset.Extensibility" /> | ||
| 32 | </ItemGroup> | 36 | </ItemGroup> |
| 33 | 37 | ||
| 34 | <!-- | 38 | <!-- |
| @@ -36,12 +40,7 @@ | |||
| 36 | you update these here, be sure to update them there. | 40 | you update these here, be sure to update them there. |
| 37 | --> | 41 | --> |
| 38 | <ItemGroup> | 42 | <ItemGroup> |
| 39 | <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" /> | 43 | <PackageReference Include="System.Text.Encoding.CodePages" /> |
| 40 | <PackageReference Include="NuGet.Versioning" Version="5.6.0" /> | 44 | <PackageReference Include="NuGet.Versioning" /> |
| 41 | </ItemGroup> | ||
| 42 | |||
| 43 | <ItemGroup> | ||
| 44 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
| 45 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 46 | </ItemGroup> | 45 | </ItemGroup> |
| 47 | </Project> | 46 | </Project> |
diff --git a/src/wix/WixToolset.Core/WixToolset.Core.v3.ncrunchproject b/src/wix/WixToolset.Core/WixToolset.Core.v3.ncrunchproject index c6001ebe..620ee137 100644 --- a/src/wix/WixToolset.Core/WixToolset.Core.v3.ncrunchproject +++ b/src/wix/WixToolset.Core/WixToolset.Core.v3.ncrunchproject | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <ProjectConfiguration> | 1 | <ProjectConfiguration> |
| 2 | <Settings> | 2 | <Settings> |
| 3 | <AdditionalFilesToIncludeForProject> | 3 | <AdditionalFilesToIncludeForProject> |
| 4 | <Value>..\..\version.json</Value> | 4 | <Value>..\..\version.txt</Value> |
| 5 | </AdditionalFilesToIncludeForProject> | 5 | </AdditionalFilesToIncludeForProject> |
| 6 | </Settings> | 6 | </Settings> |
| 7 | </ProjectConfiguration> \ No newline at end of file | 7 | </ProjectConfiguration> \ No newline at end of file |
diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj index 2374bf86..e25ebaa8 100644 --- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj +++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj | |||
| @@ -20,19 +20,4 @@ | |||
| 20 | <Content Include="Sdk\Sdk.props" CopyToOutputDirectory="PreserveNewest" /> | 20 | <Content Include="Sdk\Sdk.props" CopyToOutputDirectory="PreserveNewest" /> |
| 21 | <Content Include="Sdk\Sdk.targets" CopyToOutputDirectory="PreserveNewest" /> | 21 | <Content Include="Sdk\Sdk.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | |||
| 24 | <ItemGroup> | ||
| 25 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 26 | </ItemGroup> | ||
| 27 | |||
| 28 | <PropertyGroup> | ||
| 29 | <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn> | ||
| 30 | </PropertyGroup> | ||
| 31 | <Target Name="SetNuspecVersion"> | ||
| 32 | <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: '$(NuspecBasePath)'. Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " /> | ||
| 33 | |||
| 34 | <PropertyGroup> | ||
| 35 | <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties> | ||
| 36 | </PropertyGroup> | ||
| 37 | </Target> | ||
| 38 | </Project> | 23 | </Project> |
diff --git a/src/wix/appveyor-CoreNative.cmd b/src/wix/appveyor-CoreNative.cmd deleted file mode 100644 index d9691a42..00000000 --- a/src/wix/appveyor-CoreNative.cmd +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | |||
| 6 | :: Restore | ||
| 7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
| 8 | |||
| 9 | :: Build | ||
| 10 | msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj || exit /b | ||
| 11 | |||
| 12 | :: Test | ||
| 13 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj || exit /b | ||
| 14 | |||
| 15 | :: Pack | ||
| 16 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\WixToolset.Core.Native\WixToolset.Core.Native.csproj || exit /b | ||
| 17 | |||
| 18 | @popd | ||
| 19 | @endlocal | ||
diff --git a/src/wix/appveyor-CoreNative.yml b/src/wix/appveyor-CoreNative.yml deleted file mode 100644 index 364569cf..00000000 --- a/src/wix/appveyor-CoreNative.yml +++ /dev/null | |||
| @@ -1,44 +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 | test: off | ||
| 25 | |||
| 26 | pull_requests: | ||
| 27 | do_not_increment_build_number: true | ||
| 28 | |||
| 29 | nuget: | ||
| 30 | disable_publish_on_pr: true | ||
| 31 | |||
| 32 | skip_branch_with_pr: true | ||
| 33 | skip_tags: true | ||
| 34 | |||
| 35 | artifacts: | ||
| 36 | - path: build\Release\**\*.nupkg | ||
| 37 | name: nuget | ||
| 38 | - path: build\Release\**\*.snupkg | ||
| 39 | name: snupkg | ||
| 40 | |||
| 41 | notifications: | ||
| 42 | - provider: Slack | ||
| 43 | incoming_webhook: | ||
| 44 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/wix/appveyor-Tools.cmd b/src/wix/appveyor-Tools.cmd deleted file mode 100644 index 504b2e9d..00000000 --- a/src/wix/appveyor-Tools.cmd +++ /dev/null | |||
| @@ -1,52 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _C=Release | ||
| 4 | @if /i "%1"=="debug" set _C=Debug | ||
| 5 | @set _P=%~dp0build\%_C%\publish | ||
| 6 | @set _RCO=/S /R:1 /W:1 /NP /XO /NS /NC /NFL /NDL /NJH /NJS | ||
| 7 | |||
| 8 | :: Restore | ||
| 9 | nuget restore || exit /b | ||
| 10 | |||
| 11 | :: Build | ||
| 12 | msbuild -p:Configuration=%_C% || exit /b | ||
| 13 | |||
| 14 | :: Test | ||
| 15 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.BuildTasks || exit /b | ||
| 16 | |||
| 17 | dotnet publish -c %_C% -o %_P%\dotnet-wix\ -f netcoreapp3.1 src\wix || exit /b | ||
| 18 | |||
| 19 | dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\buildtasks\ -f net461 -r win-x86 src\WixToolset.BuildTasks || exit /b | ||
| 20 | dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\heat\ -f net461 -r win-x86 src\heat || exit /b | ||
| 21 | dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x86\wix\ -f net461 -r win-x86 src\wix || exit /b | ||
| 22 | robocopy %_P%\WixToolset.Sdk\separate\net461\x86\buildtasks %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% /XF Microsoft.Build.*.dll | ||
| 23 | robocopy %_P%\WixToolset.Sdk\separate\net461\x86\heat %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% | ||
| 24 | robocopy %_P%\WixToolset.Sdk\separate\net461\x86\wix %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% | ||
| 25 | |||
| 26 | dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x64\buildtasks\ -f net461 -r win-x64 src\WixToolset.BuildTasks || exit /b | ||
| 27 | dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x64\heat\ -f net461 -r win-x64 src\heat || exit /b | ||
| 28 | dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\separate\net461\x64\wix\ -f net461 -r win-x64 src\wix || exit /b | ||
| 29 | robocopy %_P%\WixToolset.Sdk\separate\net461\x64\buildtasks %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% /XF Microsoft.Build.*.dll | ||
| 30 | robocopy %_P%\WixToolset.Sdk\separate\net461\x64\heat %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% | ||
| 31 | robocopy %_P%\WixToolset.Sdk\separate\net461\x64\wix %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% | ||
| 32 | |||
| 33 | dotnet publish -c %_C% -p:UseAppHost=false -o %_P%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\ -f netcoreapp3.1 src\WixToolset.BuildTasks || exit /b | ||
| 34 | dotnet publish -c %_C% -p:UseAppHost=false -o %_P%\WixToolset.Sdk\separate\netcoreapp3.1\heat\ -f netcoreapp3.1 src\heat || exit /b | ||
| 35 | dotnet publish -c %_C% -p:UseAppHost=false -o %_P%\WixToolset.Sdk\separate\netcoreapp3.1\wix\ -f netcoreapp3.1 src\wix || exit /b | ||
| 36 | robocopy %_P%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll | ||
| 37 | robocopy %_P%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% | ||
| 38 | robocopy %_P%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% | ||
| 39 | |||
| 40 | dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\ src\WixToolset.Sdk || exit /b | ||
| 41 | dotnet publish -c %_C% -o %_P%\WixToolset.Sdk\broken\net461\ -f net461 -r linux-x64 src\wix || exit /b | ||
| 42 | |||
| 43 | dotnet test -c %_C% src\test\WixToolsetTest.Sdk || exit /b | ||
| 44 | |||
| 45 | :: Pack | ||
| 46 | dotnet pack -c %_C% src\dotnet-wix || exit /b | ||
| 47 | dotnet pack -c %_C% src\WixToolset.Sdk || exit /b | ||
| 48 | |||
| 49 | msbuild -p:Configuration=%_C% .\src\ThmViewerPackage\ThmViewerPackage.wixproj || exit /b | ||
| 50 | |||
| 51 | @popd | ||
| 52 | @endlocal | ||
diff --git a/src/wix/appveyor-Tools.yml b/src/wix/appveyor-Tools.yml deleted file mode 100644 index 8fea070e..00000000 --- a/src/wix/appveyor-Tools.yml +++ /dev/null | |||
| @@ -1,46 +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 | test: off | ||
| 25 | |||
| 26 | pull_requests: | ||
| 27 | do_not_increment_build_number: true | ||
| 28 | |||
| 29 | nuget: | ||
| 30 | disable_publish_on_pr: true | ||
| 31 | |||
| 32 | skip_branch_with_pr: true | ||
| 33 | skip_tags: true | ||
| 34 | |||
| 35 | artifacts: | ||
| 36 | - path: build\Release\**\*.msi | ||
| 37 | name: msi | ||
| 38 | - path: build\Release\**\*.nupkg | ||
| 39 | name: nuget | ||
| 40 | - path: build\Release\**\*.snupkg | ||
| 41 | name: snupkg | ||
| 42 | |||
| 43 | notifications: | ||
| 44 | - provider: Slack | ||
| 45 | incoming_webhook: | ||
| 46 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/wix/appveyor.cmd b/src/wix/appveyor.cmd deleted file mode 100644 index 02db695b..00000000 --- a/src/wix/appveyor.cmd +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | @setlocal | ||
| 2 | @pushd %~dp0 | ||
| 3 | @set _P=%~dp0build\Release\publish | ||
| 4 | @set _C=Release | ||
| 5 | @if /i "%1"=="debug" set _C=Debug | ||
| 6 | |||
| 7 | :: Restore | ||
| 8 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
| 9 | |||
| 10 | :: Build | ||
| 11 | msbuild -p:Configuration=%_C% || exit /b | ||
| 12 | |||
| 13 | :: Test | ||
| 14 | dotnet test -c %_C% --no-build || exit /b | ||
| 15 | |||
| 16 | :: Pack | ||
| 17 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack || exit /b | ||
| 18 | |||
| 19 | @popd | ||
| 20 | @endlocal | ||
diff --git a/src/wix/appveyor.yml b/src/wix/appveyor.yml deleted file mode 100644 index 364569cf..00000000 --- a/src/wix/appveyor.yml +++ /dev/null | |||
| @@ -1,44 +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 | test: off | ||
| 25 | |||
| 26 | pull_requests: | ||
| 27 | do_not_increment_build_number: true | ||
| 28 | |||
| 29 | nuget: | ||
| 30 | disable_publish_on_pr: true | ||
| 31 | |||
| 32 | skip_branch_with_pr: true | ||
| 33 | skip_tags: true | ||
| 34 | |||
| 35 | artifacts: | ||
| 36 | - path: build\Release\**\*.nupkg | ||
| 37 | name: nuget | ||
| 38 | - path: build\Release\**\*.snupkg | ||
| 39 | name: snupkg | ||
| 40 | |||
| 41 | notifications: | ||
| 42 | - provider: Slack | ||
| 43 | incoming_webhook: | ||
| 44 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/wix/dotnet-wix/dotnet-wix.csproj b/src/wix/dotnet-wix/dotnet-wix.csproj deleted file mode 100644 index 710ab5cd..00000000 --- a/src/wix/dotnet-wix/dotnet-wix.csproj +++ /dev/null | |||
| @@ -1,28 +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 Sdk="Microsoft.NET.Sdk"> | ||
| 5 | <PropertyGroup> | ||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| 7 | <IncludeBuildOutput>false</IncludeBuildOutput> | ||
| 8 | <Description>WiX Toolset Command-line interface</Description> | ||
| 9 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> | ||
| 10 | <NuspecBasePath>$(OutputPath)publish\dotnet-wix\</NuspecBasePath> | ||
| 11 | <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties> | ||
| 12 | </PropertyGroup> | ||
| 13 | |||
| 14 | <ItemGroup> | ||
| 15 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 16 | </ItemGroup> | ||
| 17 | |||
| 18 | <PropertyGroup> | ||
| 19 | <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn> | ||
| 20 | </PropertyGroup> | ||
| 21 | <Target Name="SetNuspecVersion"> | ||
| 22 | <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: '$(NuspecBasePath)'. Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " /> | ||
| 23 | |||
| 24 | <PropertyGroup> | ||
| 25 | <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties> | ||
| 26 | </PropertyGroup> | ||
| 27 | </Target> | ||
| 28 | </Project> | ||
diff --git a/src/wix/heat/Serialize/WixHarvesterStrings.Designer.cs b/src/wix/heat/Serialize/WixHarvesterStrings.Designer.cs index 6504a67b..cc16e57a 100644 --- a/src/wix/heat/Serialize/WixHarvesterStrings.Designer.cs +++ b/src/wix/heat/Serialize/WixHarvesterStrings.Designer.cs | |||
| @@ -39,7 +39,7 @@ namespace WixToolset.Harvesters.Extensibility.Serialize { | |||
| 39 | internal static global::System.Resources.ResourceManager ResourceManager { | 39 | internal static global::System.Resources.ResourceManager ResourceManager { |
| 40 | get { | 40 | get { |
| 41 | if (object.ReferenceEquals(resourceMan, null)) { | 41 | if (object.ReferenceEquals(resourceMan, null)) { |
| 42 | global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WixToolset.Harvesters.Extensibility.Serialize.WixHarvesterStrings", typeof(WixHarvesterStrings).Assembly); | 42 | global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("heat.Serialize.WixHarvesterStrings", typeof(WixHarvesterStrings).Assembly); |
| 43 | resourceMan = temp; | 43 | resourceMan = temp; |
| 44 | } | 44 | } |
| 45 | return resourceMan; | 45 | return resourceMan; |
diff --git a/src/wix/heat/heat.csproj b/src/wix/heat/heat.csproj index 650203b0..2aa0c278 100644 --- a/src/wix/heat/heat.csproj +++ b/src/wix/heat/heat.csproj | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
| 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 12 | <!-- <PackAsTool>true</PackAsTool> --> | 12 | <!-- <PackAsTool>true</PackAsTool> --> |
| 13 | <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86</RuntimeIdentifier> | 13 | <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86;win-x64</RuntimeIdentifiers> |
| 14 | <AppConfig>app.config</AppConfig> | 14 | <AppConfig>app.config</AppConfig> |
| 15 | <ApplicationManifest>heat.exe.manifest</ApplicationManifest> | 15 | <ApplicationManifest>heat.exe.manifest</ApplicationManifest> |
| 16 | <RollForward>LatestMajor</RollForward> | 16 | <RollForward>LatestMajor</RollForward> |
| @@ -35,20 +35,18 @@ | |||
| 35 | </EmbeddedResource> | 35 | </EmbeddedResource> |
| 36 | </ItemGroup> | 36 | </ItemGroup> |
| 37 | 37 | ||
| 38 | <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'"> | 38 | <ItemGroup> |
| 39 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" /> | 39 | <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" /> |
| 40 | <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" /> | ||
| 40 | </ItemGroup> | 41 | </ItemGroup> |
| 41 | 42 | ||
| 42 | <ItemGroup> | 43 | <ItemGroup> |
| 43 | <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" /> | 44 | <PackageReference Include="Microsoft.Win32.Registry" /> |
| 44 | <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" /> | 45 | <PackageReference Include="System.Diagnostics.PerformanceCounter" /> |
| 45 | <PackageReference Include="System.DirectoryServices" Version="4.7.0" /> | 46 | <PackageReference Include="System.DirectoryServices" /> |
| 46 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | ||
| 47 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 48 | </ItemGroup> | 47 | </ItemGroup> |
| 49 | 48 | ||
| 50 | <ItemGroup> | 49 | <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'"> |
| 51 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 50 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> |
| 52 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
| 53 | </ItemGroup> | 51 | </ItemGroup> |
| 54 | </Project> | 52 | </Project> |
diff --git a/src/wix/nuget-CoreNative.config b/src/wix/nuget-CoreNative.config deleted file mode 100644 index 18404582..00000000 --- a/src/wix/nuget-CoreNative.config +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 6 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 7 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 8 | </packageSources> | ||
| 9 | </configuration> \ No newline at end of file | ||
diff --git a/src/wix/nuget-Tools.config b/src/wix/nuget-Tools.config deleted file mode 100644 index 81117c3d..00000000 --- a/src/wix/nuget-Tools.config +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-converters" value="https://ci.appveyor.com/nuget/wixtoolset-converters" /> | ||
| 7 | <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> | ||
| 8 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 9 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 10 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 11 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
| 12 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 13 | <add key="wixtoolset-harvesters" value="https://ci.appveyor.com/nuget/wixtoolset-harvesters" /> | ||
| 14 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 15 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 16 | </packageSources> | ||
| 17 | </configuration> \ No newline at end of file | ||
diff --git a/src/wix/nuget.config b/src/wix/nuget.config deleted file mode 100644 index f985e459..00000000 --- a/src/wix/nuget.config +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <configuration> | ||
| 3 | <packageSources> | ||
| 4 | <clear /> | ||
| 5 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
| 6 | <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" /> | ||
| 7 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
| 8 | <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" /> | ||
| 9 | <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> | ||
| 10 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
| 11 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| 12 | </packageSources> | ||
| 13 | </configuration> | ||
diff --git a/src/wix/dotnet-wix/DotnetToolSettings.xml b/src/wix/pack-wix/DotnetToolSettings.xml index a7a87fb2..a7a87fb2 100644 --- a/src/wix/dotnet-wix/DotnetToolSettings.xml +++ b/src/wix/pack-wix/DotnetToolSettings.xml | |||
diff --git a/src/wix/pack-wix/pack-wix.csproj b/src/wix/pack-wix/pack-wix.csproj new file mode 100644 index 00000000..0be25c8a --- /dev/null +++ b/src/wix/pack-wix/pack-wix.csproj | |||
| @@ -0,0 +1,17 @@ | |||
| 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 Sdk="Microsoft.NET.Sdk"> | ||
| 5 | <PropertyGroup> | ||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| 7 | <IncludeBuildOutput>false</IncludeBuildOutput> | ||
| 8 | <Description>WiX Toolset Command-line interface</Description> | ||
| 9 | <PackageId>wix</PackageId> | ||
| 10 | <NuspecBasePath>$(OutputPath)publish\wix\</NuspecBasePath> | ||
| 11 | </PropertyGroup> | ||
| 12 | |||
| 13 | <ItemGroup> | ||
| 14 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 15 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 16 | </ItemGroup> | ||
| 17 | </Project> | ||
diff --git a/src/wix/dotnet-wix/dotnet-wix.nuspec b/src/wix/pack-wix/pack-wix.nuspec index 66d42c75..709d6a5f 100644 --- a/src/wix/dotnet-wix/dotnet-wix.nuspec +++ b/src/wix/pack-wix/pack-wix.nuspec | |||
| @@ -3,18 +3,21 @@ | |||
| 3 | <metadata> | 3 | <metadata> |
| 4 | <id>$id$</id> | 4 | <id>$id$</id> |
| 5 | <version>$version$</version> | 5 | <version>$version$</version> |
| 6 | <title>$title$</title> | ||
| 7 | <description>$description$</description> | ||
| 6 | <authors>$authors$</authors> | 8 | <authors>$authors$</authors> |
| 7 | <owners>$authors$</owners> | 9 | <license type="expression">MS-RL</license> |
| 8 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
| 9 | <description>$description$</description> | ||
| 10 | <copyright>$copyright$</copyright> | 11 | <copyright>$copyright$</copyright> |
| 12 | <projectUrl>$projectUrl$</projectUrl> | ||
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
| 11 | <packageTypes> | 14 | <packageTypes> |
| 12 | <packageType name="DotnetTool" /> | 15 | <packageType name="DotnetTool" /> |
| 13 | </packageTypes> | 16 | </packageTypes> |
| 14 | </metadata> | 17 | </metadata> |
| 15 | 18 | ||
| 16 | <files> | 19 | <files> |
| 17 | <file src="$projectFolder$DotnetToolSettings.xml" target="tools\netcoreapp3.1\any" /> | 20 | <file src="$projectFolder$\DotnetToolSettings.xml" target="tools\netcoreapp3.1\any" /> |
| 18 | <file src="**" target="tools\netcoreapp3.1\any" /> | 21 | <file src="**" target="tools\netcoreapp3.1\any" /> |
| 19 | </files> | 22 | </files> |
| 20 | </package> | 23 | </package> |
diff --git a/src/wix/dotnet-wix/dotnet-wix.v3.ncrunchproject b/src/wix/pack-wix/pack-wix.v3.ncrunchproject index cf22dfa9..cf22dfa9 100644 --- a/src/wix/dotnet-wix/dotnet-wix.v3.ncrunchproject +++ b/src/wix/pack-wix/pack-wix.v3.ncrunchproject | |||
diff --git a/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj b/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj index 88210bd4..310f632c 100644 --- a/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj +++ b/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <OutputType>Exe</OutputType> | 8 | <OutputType>Exe</OutputType> |
| 9 | <SignOutput>false</SignOutput> | ||
| 9 | </PropertyGroup> | 10 | </PropertyGroup> |
| 10 | 11 | ||
| 11 | <ItemGroup> | 12 | <ItemGroup> |
diff --git a/src/wix/test/Example.Extension/Example.Extension.csproj b/src/wix/test/Example.Extension/Example.Extension.csproj index 9be10d35..f2eb2195 100644 --- a/src/wix/test/Example.Extension/Example.Extension.csproj +++ b/src/wix/test/Example.Extension/Example.Extension.csproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
| 9 | <SignOutput>false</SignOutput> | ||
| 9 | </PropertyGroup> | 10 | </PropertyGroup> |
| 10 | 11 | ||
| 11 | <ItemGroup> | 12 | <ItemGroup> |
| @@ -18,7 +19,6 @@ | |||
| 18 | </ItemGroup> | 19 | </ItemGroup> |
| 19 | 20 | ||
| 20 | <ItemGroup> | 21 | <ItemGroup> |
| 21 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> | 22 | <PackageReference Include="WixToolset.Extensibility" /> |
| 22 | </ItemGroup> | 23 | </ItemGroup> |
| 23 | |||
| 24 | </Project> | 24 | </Project> |
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj index c01860cd..dc442e6f 100644 --- a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj +++ b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
| 9 | <RuntimeIdentifier>win-x86</RuntimeIdentifier> | 9 | <RuntimeIdentifier>win-x86</RuntimeIdentifier> |
| 10 | <SignOutput>false</SignOutput> | ||
| 10 | </PropertyGroup> | 11 | </PropertyGroup> |
| 11 | 12 | ||
| 12 | <ItemGroup> | 13 | <ItemGroup> |
| @@ -18,18 +19,19 @@ | |||
| 18 | 19 | ||
| 19 | <ItemGroup> | 20 | <ItemGroup> |
| 20 | <ProjectReference Include="..\..\WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" /> | 21 | <ProjectReference Include="..\..\WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" /> |
| 22 | <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" /> | ||
| 21 | </ItemGroup> | 23 | </ItemGroup> |
| 22 | 24 | ||
| 23 | <ItemGroup> | 25 | <ItemGroup> |
| 24 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" /> | 26 | <PackageReference Include="Microsoft.Build.Tasks.Core" /> |
| 25 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp3.1' " /> | 27 | <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" /> |
| 26 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | ||
| 27 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 28 | </ItemGroup> | 28 | </ItemGroup> |
| 29 | 29 | ||
| 30 | <ItemGroup> | 30 | <ItemGroup> |
| 31 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | 31 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 32 | <PackageReference Include="xunit" Version="2.4.1" /> | 32 | <PackageReference Include="xunit" /> |
| 33 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 33 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
| 34 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 35 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 34 | </ItemGroup> | 36 | </ItemGroup> |
| 35 | </Project> | 37 | </Project> |
diff --git a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj index 995d9297..0fa05242 100644 --- a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj +++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj | |||
| @@ -2,10 +2,10 @@ | |||
| 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 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | |||
| 6 | <PropertyGroup> | 5 | <PropertyGroup> |
| 7 | <TargetFramework>net461</TargetFramework> | 6 | <TargetFramework>net461</TargetFramework> |
| 8 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| @@ -17,8 +17,8 @@ | |||
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <ItemGroup> | 19 | <ItemGroup> |
| 20 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | 20 | <PackageReference Include="WixToolset.Data" /> |
| 21 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 21 | <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" /> |
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | 23 | ||
| 24 | <ItemGroup> | 24 | <ItemGroup> |
| @@ -26,8 +26,8 @@ | |||
| 26 | </ItemGroup> | 26 | </ItemGroup> |
| 27 | 27 | ||
| 28 | <ItemGroup> | 28 | <ItemGroup> |
| 29 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" /> | 29 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 30 | <PackageReference Include="xunit" Version="2.4.1" /> | 30 | <PackageReference Include="xunit" /> |
| 31 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 31 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
| 32 | </ItemGroup> | 32 | </ItemGroup> |
| 33 | </Project> | 33 | </Project> |
diff --git a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj index 29b02b95..222866d1 100644 --- a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj +++ b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| @@ -16,16 +17,22 @@ | |||
| 16 | </ItemGroup> | 17 | </ItemGroup> |
| 17 | 18 | ||
| 18 | <ItemGroup> | 19 | <ItemGroup> |
| 19 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 20 | <ProjectReference Include="..\..\WixToolset.Core\WixToolset.Core.csproj" /> |
| 20 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 21 | <ProjectReference Include="..\..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" /> |
| 21 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | 22 | <ProjectReference Include="..\..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" /> |
| 22 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | 23 | <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" /> |
| 23 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 24 | </ItemGroup> | 24 | </ItemGroup> |
| 25 | 25 | ||
| 26 | <ItemGroup> | 26 | <ItemGroup> |
| 27 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" /> | 27 | <!-- <PackageReference Include="WixBuildTools.TestSupport" /> --> |
| 28 | <PackageReference Include="xunit" Version="2.4.1" /> | 28 | <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" /> |
| 29 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="All" /> | 29 | </ItemGroup> |
| 30 | |||
| 31 | <ItemGroup> | ||
| 32 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> | ||
| 33 | <PackageReference Include="xunit" /> | ||
| 34 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | ||
| 35 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| 36 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 30 | </ItemGroup> | 37 | </ItemGroup> |
| 31 | </Project> | 38 | </Project> |
diff --git a/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj b/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj index 175ee1a9..52efb99b 100644 --- a/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj +++ b/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
| 9 | <SignOutput>false</SignOutput> | ||
| 9 | </PropertyGroup> | 10 | </PropertyGroup> |
| 10 | 11 | ||
| 11 | <PropertyGroup> | 12 | <PropertyGroup> |
| @@ -17,12 +18,13 @@ | |||
| 17 | </ItemGroup> | 18 | </ItemGroup> |
| 18 | 19 | ||
| 19 | <ItemGroup> | 20 | <ItemGroup> |
| 20 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 21 | <!-- <PackageReference Include="WixBuildTools.TestSupport" /> --> |
| 22 | <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" /> | ||
| 21 | </ItemGroup> | 23 | </ItemGroup> |
| 22 | 24 | ||
| 23 | <ItemGroup> | 25 | <ItemGroup> |
| 24 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> | 26 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 25 | <PackageReference Include="xunit" Version="2.4.1" /> | 27 | <PackageReference Include="xunit" /> |
| 26 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 28 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
| 27 | </ItemGroup> | 29 | </ItemGroup> |
| 28 | </Project> | 30 | </Project> |
diff --git a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj index 6068dbea..ae3ff65e 100644 --- a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj +++ b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <RuntimeIdentifier>win-x64</RuntimeIdentifier> | 8 | <RuntimeIdentifier>win-x64</RuntimeIdentifier> |
| 9 | <SignOutput>false</SignOutput> | ||
| 9 | </PropertyGroup> | 10 | </PropertyGroup> |
| 10 | 11 | ||
| 11 | <ItemGroup> | 12 | <ItemGroup> |
| @@ -17,10 +18,8 @@ | |||
| 17 | </ItemGroup> | 18 | </ItemGroup> |
| 18 | 19 | ||
| 19 | <ItemGroup> | 20 | <ItemGroup> |
| 20 | <PackageReference Include="GitInfo" Version="2.1.2" /> | 21 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 21 | 22 | <PackageReference Include="xunit" /> | |
| 22 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | 23 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
| 23 | <PackageReference Include="xunit" Version="2.4.1" /> | ||
| 24 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
| 25 | </ItemGroup> | 24 | </ItemGroup> |
| 26 | </Project> | 25 | </Project> |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj index fc62e932..72d4dc59 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj +++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
| 9 | <SignOutput>false</SignOutput> | ||
| 9 | </PropertyGroup> | 10 | </PropertyGroup> |
| 10 | 11 | ||
| 11 | <ItemGroup> | 12 | <ItemGroup> |
| @@ -21,12 +22,13 @@ | |||
| 21 | </ItemGroup> | 22 | </ItemGroup> |
| 22 | 23 | ||
| 23 | <ItemGroup> | 24 | <ItemGroup> |
| 24 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 25 | <!-- <PackageReference Include="WixBuildTools.TestSupport" /> --> |
| 26 | <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" /> | ||
| 25 | </ItemGroup> | 27 | </ItemGroup> |
| 26 | 28 | ||
| 27 | <ItemGroup> | 29 | <ItemGroup> |
| 28 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> | 30 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 29 | <PackageReference Include="xunit" Version="2.4.1" /> | 31 | <PackageReference Include="xunit" /> |
| 30 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 32 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
| 31 | </ItemGroup> | 33 | </ItemGroup> |
| 32 | </Project> | 34 | </Project> |
diff --git a/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj index 4af6749c..5119a038 100644 --- a/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj +++ b/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <SignOutput>false</SignOutput> | ||
| 8 | </PropertyGroup> | 9 | </PropertyGroup> |
| 9 | 10 | ||
| 10 | <ItemGroup> | 11 | <ItemGroup> |
| @@ -13,16 +14,17 @@ | |||
| 13 | 14 | ||
| 14 | <ItemGroup> | 15 | <ItemGroup> |
| 15 | <ProjectReference Include="..\..\heat\heat.csproj" /> | 16 | <ProjectReference Include="..\..\heat\heat.csproj" /> |
| 17 | <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" /> | ||
| 16 | </ItemGroup> | 18 | </ItemGroup> |
| 17 | 19 | ||
| 18 | <ItemGroup> | 20 | <ItemGroup> |
| 19 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 21 | <!-- <PackageReference Include="WixBuildTools.TestSupport" /> --> |
| 20 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | 22 | <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" /> |
| 21 | </ItemGroup> | 23 | </ItemGroup> |
| 22 | 24 | ||
| 23 | <ItemGroup> | 25 | <ItemGroup> |
| 24 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" /> | 26 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
| 25 | <PackageReference Include="xunit" Version="2.4.1" /> | 27 | <PackageReference Include="xunit" /> |
| 26 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 28 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
| 27 | </ItemGroup> | 29 | </ItemGroup> |
| 28 | </Project> | 30 | </Project> |
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs index 3c8e79e7..6c3fa863 100644 --- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs +++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs | |||
| @@ -413,7 +413,7 @@ namespace WixToolsetTest.Sdk | |||
| 413 | } | 413 | } |
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | [Theory] | 416 | [Theory(Skip = "Depends on creating broken publish which is not supported at this time")] |
| 417 | [InlineData(BuildSystem.DotNetCoreSdk)] | 417 | [InlineData(BuildSystem.DotNetCoreSdk)] |
| 418 | [InlineData(BuildSystem.MSBuild)] | 418 | [InlineData(BuildSystem.MSBuild)] |
| 419 | [InlineData(BuildSystem.MSBuild64)] | 419 | [InlineData(BuildSystem.MSBuild64)] |
diff --git a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj index 35ed053a..4716f6d7 100644 --- a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj +++ b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj | |||
| @@ -7,53 +7,25 @@ | |||
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
| 9 | <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes> | 9 | <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes> |
| 10 | <SignOutput>false</SignOutput> | ||
| 10 | </PropertyGroup> | 11 | </PropertyGroup> |
| 11 | 12 | ||
| 12 | <ItemGroup> | 13 | <ItemGroup> |
| 13 | <Content Include="TestData\HeatFilePackage\HeatFilePackage.wixproj" CopyToOutputDirectory="PreserveNewest" /> | 14 | <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" /> |
| 14 | <Content Include="TestData\HeatFilePackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 15 | <Content Include="TestData\HeatFileMultipleFilesSameFileName\HeatFileMultipleFilesSameFileName.wixproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 16 | <Content Include="TestData\HeatFileMultipleFilesSameFileName\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 17 | <Content Include="TestData\HeatFileMultipleFilesSameFileName\MyProgram.txt" CopyToOutputDirectory="PreserveNewest" /> | ||
| 18 | <Content Include="TestData\HeatFileMultipleFilesSameFileName\MyProgram.json" CopyToOutputDirectory="PreserveNewest" /> | ||
| 19 | <Content Include="TestData\HeatProject\HeatProjectPreSdkStyle\HeatProjectPreSdkStyle.wixproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 20 | <Content Include="TestData\HeatProject\HeatProjectPreSdkStyle\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 21 | <Content Include="TestData\HeatProject\HeatProjectSdkStyle\HeatProjectSdkStyle.wixproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 22 | <Content Include="TestData\HeatProject\HeatProjectSdkStyle\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 23 | <Content Include="TestData\HeatProject\SdkStyleCs\SdkStyleCs.cs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 24 | <Content Include="TestData\HeatProject\SdkStyleCs\SdkStyleCs.csproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 25 | <Content Include="TestData\HeatProject\ToolsVersion4Cs\Properties\AssemblyInfo.cs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 26 | <Content Include="TestData\HeatProject\ToolsVersion4Cs\ToolsVersion4Cs.csproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 27 | <Content Include="TestData\MergeModule\MergeMsiPackage\MergeMsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 28 | <Content Include="TestData\MergeModule\MergeMsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 29 | <Content Include="TestData\MergeModule\SimpleMergeModule\data\MergeModule.txt" CopyToOutputDirectory="PreserveNewest" /> | ||
| 30 | <Content Include="TestData\MergeModule\SimpleMergeModule\MergeModule.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 31 | <Content Include="TestData\MergeModule\SimpleMergeModule\SimpleMergeModule.wixproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 32 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 33 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.de-de.wxl" CopyToOutputDirectory="PreserveNewest" /> | ||
| 34 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | ||
| 35 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 36 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 37 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" /> | ||
| 38 | <Content Include="TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 39 | <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | ||
| 40 | <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 41 | <Content Include="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 42 | <Content Include="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" /> | ||
| 43 | <Content Include="TestData\SimpleMsiPackage\UncompressedBundle\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 44 | <Content Include="TestData\SimpleMsiPackage\UncompressedBundle\UncompressedBundle.wixproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 45 | <Content Include="TestData\SimpleMsiPackage\SimpleBundle\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 46 | <Content Include="TestData\SimpleMsiPackage\SimpleBundle\SimpleBundle.wixproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 47 | </ItemGroup> | 15 | </ItemGroup> |
| 48 | 16 | ||
| 49 | <ItemGroup> | 17 | <ItemGroup> |
| 50 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 18 | <ProjectReference Include="..\..\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" /> |
| 51 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 52 | </ItemGroup> | 19 | </ItemGroup> |
| 53 | 20 | ||
| 54 | <ItemGroup> | 21 | <ItemGroup> |
| 55 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | 22 | <!-- <PackageReference Include="WixBuildTools.TestSupport" /> --> |
| 56 | <PackageReference Include="xunit" Version="2.4.1" /> | 23 | <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" /> |
| 57 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 24 | </ItemGroup> |
| 25 | |||
| 26 | <ItemGroup> | ||
| 27 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> | ||
| 28 | <PackageReference Include="xunit" /> | ||
| 29 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> | ||
| 58 | </ItemGroup> | 30 | </ItemGroup> |
| 59 | </Project> | 31 | </Project> |
diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd new file mode 100644 index 00000000..0c650688 --- /dev/null +++ b/src/wix/wix.cmd | |||
| @@ -0,0 +1,77 @@ | |||
| 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 | @set _P_OBJ=%~dp0..\..\build\wix\obj\publish\%_C%\ | ||
| 10 | @set _P=%~dp0..\..\build\wix\%_C%\publish\ | ||
| 11 | @set _RCO=/S /R:1 /W:1 /NP /XO /NS /NC /NFL /NDL /NJH /NJS | ||
| 12 | |||
| 13 | @echo Building wix %_C% | ||
| 14 | |||
| 15 | :: Restore | ||
| 16 | msbuild -t:Restore -p:Configuration=%_C% wix.sln || exit /b | ||
| 17 | |||
| 18 | |||
| 19 | :: Build | ||
| 20 | msbuild -p:Configuration=%_C% -p:Platform=x86 wixnative\wixnative.vcxproj || exit /b | ||
| 21 | msbuild -p:Configuration=%_C% -p:Platform=x64 wixnative\wixnative.vcxproj || exit /b | ||
| 22 | msbuild -p:Configuration=%_C% -p:Platform=ARM64 wixnative\wixnative.vcxproj || exit /b | ||
| 23 | |||
| 24 | msbuild -p:Configuration=%_C% || exit /b | ||
| 25 | |||
| 26 | |||
| 27 | :: Publish | ||
| 28 | msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:PublishDir=%_P%wix\ wix\wix.csproj || exit /b | ||
| 29 | |||
| 30 | msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x86\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b | ||
| 31 | msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x86\heat\ heat\heat.csproj || exit /b | ||
| 32 | msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x86\wix\ wix\wix.csproj || exit /b | ||
| 33 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x86\buildtasks %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% /XF Microsoft.Build.*.dll | ||
| 34 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x86\heat %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% | ||
| 35 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x86\wix %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% | ||
| 36 | |||
| 37 | msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x64\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b | ||
| 38 | msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x64\heat\ heat\heat.csproj || exit /b | ||
| 39 | msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x64\wix\ wix\wix.csproj || exit /b | ||
| 40 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x64\buildtasks %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% /XF Microsoft.Build.*.dll | ||
| 41 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x64\heat %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% | ||
| 42 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x64\wix %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% | ||
| 43 | |||
| 44 | msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b | ||
| 45 | msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\heat\ heat\heat.csproj || exit /b | ||
| 46 | msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\wix\ wix\wix.csproj || exit /b | ||
| 47 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll | ||
| 48 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% | ||
| 49 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% | ||
| 50 | |||
| 51 | msbuild -t:Publish -p:Configuration=%_C% -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b | ||
| 52 | |||
| 53 | :: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test | ||
| 54 | :: msbuild -t:Publish -Restore -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=linux-x86 -p:PublishDir=%_P%WixToolset.Sdk\broken\net461\ wix\wix.csproj || exit /b | ||
| 55 | |||
| 56 | |||
| 57 | :: Test | ||
| 58 | dotnet test -c %_C% --no-build test\WixToolsetTest.BuildTasks || exit /b | ||
| 59 | dotnet test -c %_C% --no-build test\WixToolsetTest.Sdk || exit /b | ||
| 60 | |||
| 61 | :: Pack | ||
| 62 | msbuild -t:Pack -p:Configuration=%_C% pack-wix\pack-wix.csproj || exit /b | ||
| 63 | msbuild -t:Pack -p:Configuration=%_C% WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b | ||
| 64 | |||
| 65 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.Native\WixToolset.Core.Native.csproj || exit /b | ||
| 66 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core\WixToolset.Core.csproj || exit /b | ||
| 67 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.Burn\WixToolset.Core.Burn.csproj || exit /b | ||
| 68 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.ExtensionCache\WixToolset.Core.ExtensionCache.csproj || exit /b | ||
| 69 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj || exit /b | ||
| 70 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj || exit /b | ||
| 71 | |||
| 72 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Converters\WixToolset.Converters.csproj || exit /b | ||
| 73 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Converters.Symbolizer\WixToolset.Converters.Symbolizer.csproj || exit /b | ||
| 74 | |||
| 75 | |||
| 76 | @popd | ||
| 77 | @endlocal | ||
diff --git a/src/wix/wix.sln b/src/wix/wix.sln new file mode 100644 index 00000000..d1a0e78e --- /dev/null +++ b/src/wix/wix.sln | |||
| @@ -0,0 +1,470 @@ | |||
| 1 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 2 | # Visual Studio Version 16 | ||
| 3 | VisualStudioVersion = 16.0.31129.286 | ||
| 4 | MinimumVisualStudioVersion = 15.0.26124.0 | ||
| 5 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Converters", "WixToolset.Converters\WixToolset.Converters.csproj", "{6FAF6385-6598-4B89-972B-C31AFCA14538}" | ||
| 6 | EndProject | ||
| 7 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Converters.Symbolizer", "WixToolset.Converters.Symbolizer\WixToolset.Converters.Symbolizer.csproj", "{F051BCAF-698C-41D5-8427-164537CE5C5C}" | ||
| 8 | EndProject | ||
| 9 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Converters", "test\WixToolsetTest.Converters\WixToolsetTest.Converters.csproj", "{485C5038-97E1-4729-A54D-848CC69569FD}" | ||
| 10 | EndProject | ||
| 11 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Converters.Symbolizer", "test\WixToolsetTest.Converters.Symbolizer\WixToolsetTest.Converters.Symbolizer.csproj", "{9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}" | ||
| 12 | EndProject | ||
| 13 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core", "WixToolset.Core\WixToolset.Core.csproj", "{0B524850-5B9A-472B-85CC-D25920A1DFE1}" | ||
| 14 | EndProject | ||
| 15 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.WindowsInstaller", "WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj", "{5617F2A7-46A0-4D07-B9E0-E982D15641E4}" | ||
| 16 | EndProject | ||
| 17 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.Burn", "WixToolset.Core.Burn\WixToolset.Core.Burn.csproj", "{BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}" | ||
| 18 | EndProject | ||
| 19 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.ExtensionCache", "WixToolset.Core.ExtensionCache\WixToolset.Core.ExtensionCache.csproj", "{A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}" | ||
| 20 | EndProject | ||
| 21 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1284331E-BC6C-426D-AAAF-140C0174F875}" | ||
| 22 | EndProject | ||
| 23 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.Extension", "test\Example.Extension\Example.Extension.csproj", "{C66C2503-C671-4230-8B48-1D93A8532A28}" | ||
| 24 | EndProject | ||
| 25 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.CoreIntegration", "test\WixToolsetTest.CoreIntegration\WixToolsetTest.CoreIntegration.csproj", "{E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}" | ||
| 26 | EndProject | ||
| 27 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Core.Burn", "test\WixToolsetTest.Core.Burn\WixToolsetTest.Core.Burn.csproj", "{DF63F589-028E-45A1-A212-948FACF1FDCD}" | ||
| 28 | EndProject | ||
| 29 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.TestPackage", "WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj", "{853716DB-C02C-41BD-91BC-79CDC0C17D10}" | ||
| 30 | EndProject | ||
| 31 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompileCoreTestExtensionWixlib", "test\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj", "{23FC60D7-B101-42F8-9786-DB7A9CD964A2}" | ||
| 32 | EndProject | ||
| 33 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixnative", "wixnative\wixnative.vcxproj", "{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}" | ||
| 34 | EndProject | ||
| 35 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.Native", "WixToolset.Core.Native\WixToolset.Core.Native.csproj", "{81533C6A-E145-4EB5-9658-3ACA8A2A6323}" | ||
| 36 | EndProject | ||
| 37 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "heat", "heat\heat.csproj", "{E08BCE70-7D77-4B70-83F1-F08A7B58FC16}" | ||
| 38 | EndProject | ||
| 39 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wix", "wix\wix.csproj", "{C933FB6B-074C-4ED2-B961-7639A7877B3A}" | ||
| 40 | EndProject | ||
| 41 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BuildTasks", "WixToolset.BuildTasks\WixToolset.BuildTasks.csproj", "{D04EE8DF-85E5-42E5-B7B4-D064818F32C5}" | ||
| 42 | EndProject | ||
| 43 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Sdk", "WixToolset.Sdk\WixToolset.Sdk.csproj", "{FD77501F-E720-4493-8750-5C639B3CD256}" | ||
| 44 | EndProject | ||
| 45 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Sdk", "test\WixToolsetTest.Sdk\WixToolsetTest.Sdk.csproj", "{C44BB95F-5020-4876-933C-B73A24C488FD}" | ||
| 46 | EndProject | ||
| 47 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Heat", "test\WixToolsetTest.Heat\WixToolsetTest.Heat.csproj", "{9D788104-2636-4E4C-891C-08FF05FEC31E}" | ||
| 48 | EndProject | ||
| 49 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Core.Native", "test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj", "{93645356-5D5F-45DE-AC7F-252D35E1ACE5}" | ||
| 50 | EndProject | ||
| 51 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BuildTasks", "test\WixToolsetTest.BuildTasks\WixToolsetTest.BuildTasks.csproj", "{A05698E0-30D9-4B36-8F3B-585A99D67118}" | ||
| 52 | EndProject | ||
| 53 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "pack-wix", "pack-wix\pack-wix.csproj", "{CE489499-60E1-4883-B72A-CA8F95DBA073}" | ||
| 54 | EndProject | ||
| 55 | Global | ||
| 56 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 57 | Debug|Any CPU = Debug|Any CPU | ||
| 58 | Debug|ARM64 = Debug|ARM64 | ||
| 59 | Debug|x64 = Debug|x64 | ||
| 60 | Debug|x86 = Debug|x86 | ||
| 61 | Release|Any CPU = Release|Any CPU | ||
| 62 | Release|ARM64 = Release|ARM64 | ||
| 63 | Release|x64 = Release|x64 | ||
| 64 | Release|x86 = Release|x86 | ||
| 65 | EndGlobalSection | ||
| 66 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 67 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 68 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 69 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 70 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 71 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 72 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 73 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 74 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 75 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 76 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 77 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 78 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 79 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 80 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x64.Build.0 = Release|Any CPU | ||
| 81 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 82 | {6FAF6385-6598-4B89-972B-C31AFCA14538}.Release|x86.Build.0 = Release|Any CPU | ||
| 83 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 84 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 85 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 86 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 87 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 88 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 89 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 90 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 91 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 92 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 93 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 94 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 95 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 96 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x64.Build.0 = Release|Any CPU | ||
| 97 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 98 | {F051BCAF-698C-41D5-8427-164537CE5C5C}.Release|x86.Build.0 = Release|Any CPU | ||
| 99 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 100 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 101 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 102 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 103 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 104 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 105 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 106 | {485C5038-97E1-4729-A54D-848CC69569FD}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 107 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 108 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 109 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 110 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 111 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 112 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x64.Build.0 = Release|Any CPU | ||
| 113 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 114 | {485C5038-97E1-4729-A54D-848CC69569FD}.Release|x86.Build.0 = Release|Any CPU | ||
| 115 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 116 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 117 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 118 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 119 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 120 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 121 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 122 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 123 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 124 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 125 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 126 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 127 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 128 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x64.Build.0 = Release|Any CPU | ||
| 129 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 130 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C}.Release|x86.Build.0 = Release|Any CPU | ||
| 131 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 132 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 133 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 134 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 135 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 136 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 137 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 138 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 139 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 140 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 141 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 142 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 143 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 144 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|x64.Build.0 = Release|Any CPU | ||
| 145 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 146 | {0B524850-5B9A-472B-85CC-D25920A1DFE1}.Release|x86.Build.0 = Release|Any CPU | ||
| 147 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 148 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 149 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 150 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 151 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 152 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 153 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 154 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 155 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 156 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 157 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 158 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 159 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 160 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|x64.Build.0 = Release|Any CPU | ||
| 161 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 162 | {5617F2A7-46A0-4D07-B9E0-E982D15641E4}.Release|x86.Build.0 = Release|Any CPU | ||
| 163 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 164 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 165 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 166 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 167 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 168 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 169 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 170 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 171 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 172 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 173 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 174 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 175 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 176 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x64.Build.0 = Release|Any CPU | ||
| 177 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 178 | {BC19D30D-C1B6-46DF-95B3-8EDF688E0FEC}.Release|x86.Build.0 = Release|Any CPU | ||
| 179 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 180 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 181 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 182 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 183 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 184 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 185 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 186 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 187 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 188 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 189 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 190 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 191 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 192 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|x64.Build.0 = Release|Any CPU | ||
| 193 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 194 | {A1F0DF11-87FB-4BBC-B53B-83F2CE66604A}.Release|x86.Build.0 = Release|Any CPU | ||
| 195 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 196 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 197 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 198 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 199 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 200 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 201 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 202 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 203 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 204 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 205 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 206 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 207 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 208 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|x64.Build.0 = Release|Any CPU | ||
| 209 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 210 | {C66C2503-C671-4230-8B48-1D93A8532A28}.Release|x86.Build.0 = Release|Any CPU | ||
| 211 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 212 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 213 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 214 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 215 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 216 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 217 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 218 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 219 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 220 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 221 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 222 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 223 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 224 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x64.Build.0 = Release|Any CPU | ||
| 225 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 226 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B}.Release|x86.Build.0 = Release|Any CPU | ||
| 227 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 228 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 229 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 230 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 231 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 232 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 233 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 234 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 235 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 236 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 237 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 238 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 239 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 240 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|x64.Build.0 = Release|Any CPU | ||
| 241 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 242 | {DF63F589-028E-45A1-A212-948FACF1FDCD}.Release|x86.Build.0 = Release|Any CPU | ||
| 243 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 244 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 245 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 246 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 247 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 248 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 249 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 250 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 251 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 252 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 253 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 254 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 255 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 256 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|x64.Build.0 = Release|Any CPU | ||
| 257 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 258 | {853716DB-C02C-41BD-91BC-79CDC0C17D10}.Release|x86.Build.0 = Release|Any CPU | ||
| 259 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 260 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 261 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 262 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 263 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 264 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 265 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 266 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 267 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 268 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 269 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 270 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 271 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 272 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|x64.Build.0 = Release|Any CPU | ||
| 273 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 274 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2}.Release|x86.Build.0 = Release|Any CPU | ||
| 275 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
| 276 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
| 277 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
| 278 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
| 279 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 280 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x64.Build.0 = Debug|x64 | ||
| 281 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 282 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x86.Build.0 = Debug|Win32 | ||
| 283 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
| 284 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|Any CPU.Build.0 = Release|Win32 | ||
| 285 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
| 286 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|ARM64.Build.0 = Release|ARM64 | ||
| 287 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x64.ActiveCfg = Release|x64 | ||
| 288 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x64.Build.0 = Release|x64 | ||
| 289 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x86.ActiveCfg = Release|Win32 | ||
| 290 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x86.Build.0 = Release|Win32 | ||
| 291 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 292 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 293 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 294 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 295 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 296 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 297 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 298 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 299 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 300 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 301 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 302 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 303 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 304 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|x64.Build.0 = Release|Any CPU | ||
| 305 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 306 | {81533C6A-E145-4EB5-9658-3ACA8A2A6323}.Release|x86.Build.0 = Release|Any CPU | ||
| 307 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 308 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 309 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 310 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 311 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 312 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 313 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 314 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 315 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 316 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 317 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 318 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 319 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 320 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|x64.Build.0 = Release|Any CPU | ||
| 321 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 322 | {E08BCE70-7D77-4B70-83F1-F08A7B58FC16}.Release|x86.Build.0 = Release|Any CPU | ||
| 323 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 324 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 325 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 326 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 327 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 328 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 329 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 330 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 331 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 332 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 333 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 334 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 335 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 336 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Release|x64.Build.0 = Release|Any CPU | ||
| 337 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 338 | {C933FB6B-074C-4ED2-B961-7639A7877B3A}.Release|x86.Build.0 = Release|Any CPU | ||
| 339 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 340 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 341 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 342 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 343 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 344 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 345 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 346 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 347 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 348 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 349 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 350 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 351 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 352 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Release|x64.Build.0 = Release|Any CPU | ||
| 353 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 354 | {D04EE8DF-85E5-42E5-B7B4-D064818F32C5}.Release|x86.Build.0 = Release|Any CPU | ||
| 355 | {FD77501F-E720-4493-8750-5C639B3CD256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 356 | {FD77501F-E720-4493-8750-5C639B3CD256}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 357 | {FD77501F-E720-4493-8750-5C639B3CD256}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 358 | {FD77501F-E720-4493-8750-5C639B3CD256}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 359 | {FD77501F-E720-4493-8750-5C639B3CD256}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 360 | {FD77501F-E720-4493-8750-5C639B3CD256}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 361 | {FD77501F-E720-4493-8750-5C639B3CD256}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 362 | {FD77501F-E720-4493-8750-5C639B3CD256}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 363 | {FD77501F-E720-4493-8750-5C639B3CD256}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 364 | {FD77501F-E720-4493-8750-5C639B3CD256}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 365 | {FD77501F-E720-4493-8750-5C639B3CD256}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 366 | {FD77501F-E720-4493-8750-5C639B3CD256}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 367 | {FD77501F-E720-4493-8750-5C639B3CD256}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 368 | {FD77501F-E720-4493-8750-5C639B3CD256}.Release|x64.Build.0 = Release|Any CPU | ||
| 369 | {FD77501F-E720-4493-8750-5C639B3CD256}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 370 | {FD77501F-E720-4493-8750-5C639B3CD256}.Release|x86.Build.0 = Release|Any CPU | ||
| 371 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 372 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 373 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 374 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 375 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 376 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 377 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 378 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 379 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 380 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 381 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 382 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 383 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 384 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|x64.Build.0 = Release|Any CPU | ||
| 385 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 386 | {C44BB95F-5020-4876-933C-B73A24C488FD}.Release|x86.Build.0 = Release|Any CPU | ||
| 387 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 388 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 389 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 390 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 391 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 392 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 393 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 394 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 395 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 396 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 397 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 398 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 399 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 400 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|x64.Build.0 = Release|Any CPU | ||
| 401 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 402 | {9D788104-2636-4E4C-891C-08FF05FEC31E}.Release|x86.Build.0 = Release|Any CPU | ||
| 403 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 404 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 405 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 406 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 407 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 408 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 409 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 410 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 411 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 412 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 413 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 414 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 415 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 416 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Release|x64.Build.0 = Release|Any CPU | ||
| 417 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 418 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5}.Release|x86.Build.0 = Release|Any CPU | ||
| 419 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 420 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 421 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 422 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 423 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 424 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 425 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 426 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 427 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 428 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 429 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 430 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 431 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 432 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Release|x64.Build.0 = Release|Any CPU | ||
| 433 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 434 | {A05698E0-30D9-4B36-8F3B-585A99D67118}.Release|x86.Build.0 = Release|Any CPU | ||
| 435 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 436 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 437 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
| 438 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
| 439 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 440 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 441 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 442 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 443 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 444 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 445 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
| 446 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Release|ARM64.Build.0 = Release|Any CPU | ||
| 447 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 448 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Release|x64.Build.0 = Release|Any CPU | ||
| 449 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 450 | {CE489499-60E1-4883-B72A-CA8F95DBA073}.Release|x86.Build.0 = Release|Any CPU | ||
| 451 | EndGlobalSection | ||
| 452 | GlobalSection(SolutionProperties) = preSolution | ||
| 453 | HideSolutionNode = FALSE | ||
| 454 | EndGlobalSection | ||
| 455 | GlobalSection(NestedProjects) = preSolution | ||
| 456 | {485C5038-97E1-4729-A54D-848CC69569FD} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 457 | {9DB36DB1-24A1-47A7-9E57-D48A2E33C13C} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 458 | {C66C2503-C671-4230-8B48-1D93A8532A28} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 459 | {E8A08E86-1780-4ED4-8F63-AB2B52C1C16B} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 460 | {DF63F589-028E-45A1-A212-948FACF1FDCD} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 461 | {23FC60D7-B101-42F8-9786-DB7A9CD964A2} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 462 | {C44BB95F-5020-4876-933C-B73A24C488FD} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 463 | {9D788104-2636-4E4C-891C-08FF05FEC31E} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 464 | {93645356-5D5F-45DE-AC7F-252D35E1ACE5} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 465 | {A05698E0-30D9-4B36-8F3B-585A99D67118} = {1284331E-BC6C-426D-AAAF-140C0174F875} | ||
| 466 | EndGlobalSection | ||
| 467 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 468 | SolutionGuid = {BB8820D5-723D-426D-B4A0-4D221603C5FA} | ||
| 469 | EndGlobalSection | ||
| 470 | EndGlobal | ||
diff --git a/src/api/wix/WixToolset.Data.v3.ncrunchsolution b/src/wix/wix.v3.ncrunchsolution index 10420ac9..10420ac9 100644 --- a/src/api/wix/WixToolset.Data.v3.ncrunchsolution +++ b/src/wix/wix.v3.ncrunchsolution | |||
diff --git a/src/wix/wix/wix.csproj b/src/wix/wix/wix.csproj index 7fac5e95..6d2e3906 100644 --- a/src/wix/wix/wix.csproj +++ b/src/wix/wix/wix.csproj | |||
| @@ -5,15 +5,15 @@ | |||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks> | 6 | <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks> |
| 7 | <OutputType>Exe</OutputType> | 7 | <OutputType>Exe</OutputType> |
| 8 | <Description>Compiler</Description> | 8 | <Description>WiX Toolset create installation packages.</Description> |
| 9 | <Title>WiX Toolset Compiler</Title> | ||
| 10 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
| 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 12 | <!-- <PackAsTool>true</PackAsTool> --> | 11 | <PackAsTool>true</PackAsTool> |
| 13 | <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86</RuntimeIdentifier> | 12 | <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86;win-x64</RuntimeIdentifiers> |
| 14 | <AppConfig>app.config</AppConfig> | 13 | <AppConfig>app.config</AppConfig> |
| 15 | <ApplicationManifest>wix.exe.manifest</ApplicationManifest> | 14 | <ApplicationManifest>wix.exe.manifest</ApplicationManifest> |
| 16 | <RollForward>Major</RollForward> | 15 | <RollForward>Major</RollForward> |
| 16 | <NuspecBasePath>$(OutputPath)publish\wix\</NuspecBasePath> | ||
| 17 | </PropertyGroup> | 17 | </PropertyGroup> |
| 18 | 18 | ||
| 19 | <PropertyGroup> | 19 | <PropertyGroup> |
| @@ -21,19 +21,43 @@ | |||
| 21 | </PropertyGroup> | 21 | </PropertyGroup> |
| 22 | 22 | ||
| 23 | <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'"> | 23 | <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'"> |
| 24 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" /> | 24 | <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> |
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | 26 | ||
| 27 | <ItemGroup> | 27 | <ItemGroup> |
| 28 | <PackageReference Include="WixToolset.Converters" Version="4.0.*" /> | 28 | <ProjectReference Include="..\WixToolset.Converters\WixToolset.Converters.csproj" /> |
| 29 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 29 | <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" /> |
| 30 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | 30 | <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" /> |
| 31 | <PackageReference Include="WixToolset.Core.ExtensionCache" Version="4.0.*" /> | 31 | <ProjectReference Include="..\WixToolset.Core.ExtensionCache\WixToolset.Core.ExtensionCache.csproj" /> |
| 32 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | 32 | <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" /> |
| 33 | </ItemGroup> | ||
| 34 | |||
| 35 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | ||
| 36 | <NativeLibrary Include="..\wixnative\Win32\mergemod.dll" RuntimeIdentifier="win-x86" /> | ||
| 37 | <NativeLibrary Include="..\wixnative\x64\mergemod.dll" RuntimeIdentifier="win-x64" /> | ||
| 38 | <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\ARM64\wixnative.exe" RuntimeIdentifier="win-arm64" /> | ||
| 39 | <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\ARM64\wixnative.pdb" RuntimeIdentifier="win-arm64" /> | ||
| 40 | <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" RuntimeIdentifier="win-x64" /> | ||
| 41 | <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.pdb" RuntimeIdentifier="win-x64" /> | ||
| 42 | <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" RuntimeIdentifier="win-x86" /> | ||
| 43 | <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.pdb" RuntimeIdentifier="win-x86" /> | ||
| 33 | </ItemGroup> | 44 | </ItemGroup> |
| 34 | 45 | ||
| 35 | <ItemGroup> | 46 | <ItemGroup> |
| 36 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 47 | <!-- |
| 37 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 48 | This PackageReference is required so the RuntimeTargetsCopyLocalItems have a package (any package would |
| 49 | do, WixToolset.Data is as good as any) to "attach" themselves to. | ||
| 50 | --> | ||
| 51 | <PackageReference Include="WixToolset.Data" /> | ||
| 52 | |||
| 53 | <RuntimeTargetsCopyLocalItems Include="@(NativeLibrary)" | ||
| 54 | AssetType="native" | ||
| 55 | DestinationSubDirectory="runtimes\%(RuntimeIdentifier)\native\" | ||
| 56 | NuGetPackageId="WixToolset.Data" | ||
| 57 | RuntimeIdentifier="%(RuntimeIdentifier)" | ||
| 58 | /> | ||
| 59 | <Content Include="@(RuntimeTargetsCopyLocalItems)" | ||
| 60 | Link="%(DestinationSubDirectory)\%(FileName)%(Extension)" | ||
| 61 | CopyToOutputDirectory="PreserveNewest" /> | ||
| 38 | </ItemGroup> | 62 | </ItemGroup> |
| 39 | </Project> | 63 | </Project> |
diff --git a/src/wix/wix/wix.net461.v3.ncrunchproject b/src/wix/wix/wix.net461.v3.ncrunchproject deleted file mode 100644 index cf22dfa9..00000000 --- a/src/wix/wix/wix.net461.v3.ncrunchproject +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/wix/wix/wix.netcoreapp2.1.v3.ncrunchproject b/src/wix/wix/wix.netcoreapp2.1.v3.ncrunchproject deleted file mode 100644 index cf22dfa9..00000000 --- a/src/wix/wix/wix.netcoreapp2.1.v3.ncrunchproject +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/wix/wixnative/packages.config b/src/wix/wixnative/packages.config deleted file mode 100644 index a98c0c8e..00000000 --- a/src/wix/wixnative/packages.config +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <packages> | ||
| 3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
| 7 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
| 8 | </packages> \ No newline at end of file | ||
diff --git a/src/wix/wixnative/wixnative.vcxproj b/src/wix/wixnative/wixnative.vcxproj index 20959827..abe9a38e 100644 --- a/src/wix/wixnative/wixnative.vcxproj +++ b/src/wix/wixnative/wixnative.vcxproj | |||
| @@ -63,13 +63,9 @@ | |||
| 63 | </ItemGroup> | 63 | </ItemGroup> |
| 64 | 64 | ||
| 65 | <ItemGroup> | 65 | <ItemGroup> |
| 66 | <ContentWithTargetPath Include="$(Platform)\mergemod.dll" CopyToOutputDirectory="PreserveNewest" TargetPath="mergemod.dll" /> | 66 | <PackageReference Include="WixToolset.Dutil" /> |
| 67 | </ItemGroup> | 67 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 68 | 68 | <PackageReference Include="GitInfo" /> | |
| 69 | <ItemGroup> | ||
| 70 | <PackageReference Include="WixToolset.Dutil" Version="4.0.72" /> | ||
| 71 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | ||
| 72 | <PackageReference Include="GitInfo" Version="2.1.2" /> | ||
| 73 | </ItemGroup> | 69 | </ItemGroup> |
| 74 | 70 | ||
| 75 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 71 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |