wixtoolset
/
Netfx.wixext
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update dependencies.

This commit is contained in:
Sean Hall 2021-01-03 15:25:43 -06:00
Родитель f26403f12b
Коммит df3a3eba86
8 изменённых файлов: 65 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
NetFx.wixext.sln
Просмотреть файл

@ -27,6 +27,7 @@ Global
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.ActiveCfg = Debug|Win32
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.Build.0 = Debug|Win32
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.ActiveCfg = Release|Win32
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.Build.0 = Release|Win32
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x64.ActiveCfg = Release|Win32
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.ActiveCfg = Release|Win32
{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.Build.0 = Release|Win32
@ -36,6 +37,7 @@ Global
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|x86.ActiveCfg = Debug|x86
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Debug|x86.Build.0 = Debug|x86
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|Any CPU.ActiveCfg = Release|x86
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|Any CPU.Build.0 = Release|x86
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x64.ActiveCfg = Release|x86
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x86.ActiveCfg = Release|x86
{45E4A6AC-3190-4E17-83F0-9935FFA5DC2B}.Release|x86.Build.0 = Release|x86

5
appveyor.cmd
Просмотреть файл

@ -3,12 +3,11 @@
nuget restore || exit /b
msbuild -p:Configuration=Release -t:Restore || exit /b
msbuild -p:Configuration=Release -Restore || exit /b
msbuild -p:Configuration=Release src\test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj || exit /b
dotnet test -c Release --no-build src\test\WixToolsetTest.Netfx || exit /b
msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.NetFx.wixext.csproj || exit /b
msbuild -p:Configuration=Release -p:NoBuild=true -t:Pack src\wixext\WixToolset.NetFx.wixext.csproj || exit /b
@popd
@endlocal

2
global.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"msbuild-sdks": {
"WixToolset.Sdk": "4.0.0-build-0175"
"WixToolset.Sdk": "4.0.0-build-0176"
}
}

8
src/Cpp.Build.props
Просмотреть файл

@ -6,12 +6,20 @@
<Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
<IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
<OutDir>$(OutputPath)$(Platform)\</OutDir>
<!-- NBGV properties -->
<AssemblyCompany>$(Company)</AssemblyCompany>
<AssemblyCopyright>$(Copyright)</AssemblyCopyright>
</PropertyGroup>
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
<WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>

8
src/CustomizedNativeRecommendedRules.ruleset Normal file
Просмотреть файл

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RuleSet Name="Customized Microsoft Native Recommended Rules" Description="Microsoft Native Recommended Rules, -C26812" ToolsVersion="16.0">
<Include Path="nativerecommendedrules.ruleset" Action="Default" />
<Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
<!-- We need C style enums since we support BAs written in C -->
<Rule Id="C26812" Action="None" />
</Rules>
</RuleSet>

15
src/wixext/WixToolset.Netfx.wixext.csproj
Просмотреть файл

@ -7,9 +7,10 @@
<RootNamespace>WixToolset.Netfx</RootNamespace>
<Description>WiX Toolset .NET Framework Extension</Description>
<Title>WiX Toolset .NET Framework Extension</Title>
<IsTool>true</IsTool>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<ContentTargetFolders>build</ContentTargetFolders>
<DebugType>embedded</DebugType>
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
<IncludeSymbols>true</IncludeSymbols>
<NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
</PropertyGroup>
<ItemGroup>
@ -18,6 +19,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
<PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
<PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
</ItemGroup>
@ -29,4 +31,11 @@
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
</ItemGroup>
<Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion">
<PropertyGroup>
<NuspecBasePath>$(OutputPath)..\</NuspecBasePath>
<NuspecProperties>$(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
</PropertyGroup>
</Target>
</Project>

26
src/wixext/WixToolset.Netfx.wixext.nuspec Normal file
Просмотреть файл

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata minClientVersion="4.0">
<id>$id$</id>
<version>$version$</version>
<authors>$authors$</authors>
<owners>$authors$</owners>
<license type="expression">MS-RL</license>
<projectUrl>https://github.com/wixtoolset/Netfx.wixext</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<title>$title$</title>
<description>$description$</description>
<copyright>$copyright$</copyright>
<repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
</metadata>
<files>
<file src="$projectFolder$$id$.targets" target="build" />
<file src="netstandard2.0\$id$.dll" target="tools" />
<file src="ARM64\*.pdb" target="pdbs\ARM64" />
<file src="x86\*.pdb" target="pdbs\x86" />
<file src="x64\*.pdb" target="pdbs\x64" />
</files>
</package>

6
src/wixlib/netfx.wixproj
Просмотреть файл

@ -27,4 +27,10 @@
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
</ItemGroup>
<!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway -->
<Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants">
<PropertyGroup>
<ProjectReferenceDefineConstants></ProjectReferenceDefineConstants>
</PropertyGroup>
</Target>
</Project>