@joebigelow / wix / commits / 6135ca6f

Update to latest Home\repo-template

Rob Mensching committed Dec 22, 2018 at 10:44 UTC 6135ca6f532668ae953a738a3925f4da32b3ae25
11 files changed +130 -55
.editorconfig
+3
@@ -1,4 +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.
2 +#
3 +# Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig
4 +# then update all of the repos.
5
6 root = true
7
.gitignore
+52 -16
@@ -4,6 +4,7 @@
4 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
5
6 # User-specific files
7 +*.rsuser
8 *.suo
9 *.user
10 *.userosscache
@@ -19,19 +20,21 @@
20 [Rr]eleases/
21 x64/
22 x86/
23 +[Aa][Rr][Mm]/
24 +[Aa][Rr][Mm]64/
25 bld/
26 [Bb]in/
27 [Oo]bj/
28 [Ll]og/
29
27 -# VSCode
28 -.vscode/
29 -
30 -# Visual Studio 2015 cache/options directory
30 +# Visual Studio 2015/2017 cache/options directory
31 .vs/
32 # Uncomment if you have tasks that create the project's static files in wwwroot
33 #wwwroot/
34
35 +# Visual Studio 2017 auto generated files
36 +Generated\ Files/
37 +
38 # MSTest test Results
39 [Tt]est[Rr]esult*/
40 [Bb]uild[Ll]og.*
@@ -52,16 +55,21 @@ BenchmarkDotNet.Artifacts/
55 project.lock.json
56 project.fragment.lock.json
57 artifacts/
55 -**/Properties/launchSettings.json
58
59 +# StyleCop
60 +StyleCopReport.xml
61 +
62 +# Files built by Visual Studio
63 *_i.c
64 *_p.c
59 -*_i.h
65 +*_h.h
66 *.ilk
67 *.meta
68 *.obj
69 +*.iobj
70 *.pch
71 *.pdb
72 +*.ipdb
73 *.pgc
74 *.pgd
75 *.rsp
@@ -71,6 +79,7 @@ artifacts/
79 *.tlh
80 *.tmp
81 *.tmp_proj
82 +*_wpftmp.csproj
83 *.log
84 *.vspscc
85 *.vssscc
@@ -99,6 +108,9 @@ ipch/
108 *.vspx
109 *.sap
110
111 +# Visual Studio Trace Files
112 +*.e2e
113 +
114 # TFS 2012 Local Workspace
115 $tf/
116
@@ -171,11 +183,11 @@ PublishScripts/
183 # NuGet Packages
184 *.nupkg
185 # The packages folder can be ignored because of Package Restore
174 -**/packages/*
186 +**/[Pp]ackages/*
187 # except build/, which is used as an MSBuild target.
176 -!**/packages/build/
188 +!**/[Pp]ackages/build/
189 # Uncomment if necessary however generally it will be regenerated when needed
178 -#!**/packages/repositories.config
190 +#!**/[Pp]ackages/repositories.config
191 # NuGet v3's project.json files produces more ignorable files
192 *.nuget.props
193 *.nuget.targets
@@ -199,7 +211,7 @@ _pkginfo.txt
211 # files ending in .cache can be ignored
212 *.[Cc]ache
213 # but keep track of directories ending in .cache
202 -!*.[Cc]ache/
214 +!?*.[Cc]ache/
215
216 # Others
217 ClientBin/
@@ -212,9 +224,15 @@ ClientBin/
224 *.publishsettings
225 orleans.codegen.cs
226
227 +# Including strong name files can present a security risk
228 +# (https://github.com/github/gitignore/pull/2483#issue-259490424)
229 +#*.snk
230 +
231 # Since there are multiple workflows, uncomment next line to ignore bower_components
232 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
233 #bower_components/
234 +# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
235 +**/wwwroot/lib/
236
237 # RIA/Silverlight projects
238 Generated_Code/
@@ -226,6 +244,8 @@ _UpgradeReport_Files/
244 Backup*/
245 UpgradeLog*.XML
246 UpgradeLog*.htm
247 +ServiceFabricBackup/
248 +*.rptproj.bak
249
250 # SQL Server files
251 *.mdf
@@ -236,6 +256,7 @@ UpgradeLog*.htm
256 *.rdl.data
257 *.bim.layout
258 *.bim_*.settings
259 +*.rptproj.rsuser
260
261 # Microsoft Fakes
262 FakesAssemblies/
@@ -247,9 +268,6 @@ FakesAssemblies/
268 .ntvs_analysis.dat
269 node_modules/
270
250 -# Typescript v1 declaration files
251 -typings/
252 -
271 # Visual Studio 6 build log
272 *.plg
273
@@ -278,8 +296,8 @@ paket-files/
296 .idea/
297 *.sln.iml
298
281 -# CodeRush
282 -.cr/
299 +# CodeRush personal settings
300 +.cr/personal
301
302 # Python Tools for Visual Studio (PTVS)
303 __pycache__/
@@ -302,4 +320,22 @@ __pycache__/
320 *.xsd.cs
321
322 # OpenCover UI analysis results
305 -OpenCover/
\ No newline at end of file
323 +OpenCover/
324 +
325 +# Azure Stream Analytics local run output
326 +ASALocalRun/
327 +
328 +# MSBuild Binary and Structured Log
329 +*.binlog
330 +
331 +# NVidia Nsight GPU debugger configuration file
332 +*.nvuser
333 +
334 +# MFractors (Xamarin productivity tool) working folder
335 +.mfractor/
336 +
337 +# Local History for Visual Studio
338 +.localhistory/
339 +
340 +# BeatPulse healthcheck temp database
341 +healthchecksdb
Tools.v3.ncrunchsolution new
+6
@@ -0,0 +1,6 @@
1 +<SolutionConfiguration>
2 + <Settings>
3 + <AllowParallelTestExecution>True</AllowParallelTestExecution>
4 + <SolutionConfigured>True</SolutionConfigured>
5 + </Settings>
6 +</SolutionConfiguration>
\ No newline at end of file
appveyor.yml
+7 -5
@@ -1,3 +1,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 +#
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 2017
7
8 version: 0.0.0.{build}
@@ -8,12 +13,8 @@ environment:
13 DOTNET_CLI_TELEMETRY_OPTOUT: 1
14 NUGET_XMLDOC_MODE: skip
15
11 -branches:
12 - only:
13 - - master
14 -
16 build_script:
16 -- appveyor.cmd
17 + - appveyor.cmd
18
19 pull_requests:
20 do_not_increment_build_number: true
@@ -21,6 +22,7 @@ pull_requests:
22 nuget:
23 disable_publish_on_pr: true
24
25 +skip_branch_with_pr: true
26 skip_tags: true
27
28 artifacts:
src/Directory.Build.props
+3 -6
@@ -1,7 +1,7 @@
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\src\Directory.Build.props
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>
@@ -10,20 +10,17 @@
10 <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
11
12 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
13 - <BaseOutputPath>$(MSBuildThisFileDirectory)..\build\</BaseOutputPath>
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
23 - <PropertyGroup>
24 - <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder>
25 - </PropertyGroup>
26 -
24 <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " />
25 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
26 </Project>
src/Directory.Build.targets new
+48
@@ -0,0 +1,48 @@
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>(?&lt;="[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>
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+3 -8
@@ -32,14 +32,9 @@
32 </ItemGroup>
33
34 <ItemGroup>
35 - <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core\WixToolset.Core.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
36 - <PackageReference Include="WixToolset.Core" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " />
37 -
38 - <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
39 - <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " />
40 -
41 - <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
42 - <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " />
35 + <PackageReference Include="WixToolset.Core" Version="4.0.*" />
36 + <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
37 + <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
38 </ItemGroup>
39
40 <ItemGroup>
src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj
+3 -8
@@ -11,14 +11,9 @@
11 </PropertyGroup>
12
13 <ItemGroup>
14 - <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\README.md') " />
15 - <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\README.md') " />
16 -
17 - <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\README.md') " />
18 - <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\README.md') " />
19 -
20 - <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core\WixToolset.Core.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
21 - <PackageReference Include="WixToolset.Core" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " />
14 + <PackageReference Include="WixToolset.Data" Version="4.0.*" />
15 + <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
16 + <PackageReference Include="WixToolset.Core" Version="4.0.*" />
17 </ItemGroup>
18
19 <ItemGroup>
src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
+1 -2
@@ -29,8 +29,7 @@
29 </ItemGroup>
30
31 <ItemGroup>
32 - <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
33 - <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " />
32 + <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
33 </ItemGroup>
34
35 <ItemGroup>
src/wix/wix.csproj
+3 -8
@@ -21,14 +21,9 @@
21 </ItemGroup>
22
23 <ItemGroup>
24 - <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core\WixToolset.Core.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
25 - <PackageReference Include="WixToolset.Core" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " />
26 -
27 - <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
28 - <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " />
29 -
30 - <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
31 - <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " />
24 + <PackageReference Include="WixToolset.Core" Version="4.0.*" />
25 + <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
26 + <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
27 </ItemGroup>
28
29 <ItemGroup>
src/wixcop/WixCop.csproj
+1 -2
@@ -21,8 +21,7 @@
21 </ItemGroup>
22
23 <ItemGroup>
24 - <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core\WixToolset.Core.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
25 - <PackageReference Include="WixToolset.Core" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " />
24 + <PackageReference Include="WixToolset.Core" Version="4.0.*" />
25 </ItemGroup>
26
27 <ItemGroup>