Permalink
Browse files

Merge remote-tracking branch 'origin/master' into fix382

  • Loading branch information...
AArnott committed Sep 5, 2018
2 parents 5e7dcc0 + cc3aa96 commit b5619d738fd32527c2420eca3de02535ebb802fe
Showing with 154 additions and 71 deletions.
  1. +10 −0 .appveyor.yml
  2. +95 −0 .vsts-ci.yml
  3. +1 −0 README.md
  4. +2 −0 build.ps1
  5. +2 −2 src/AdvApi32/AdvApi32.csproj
  6. +1 −2 src/BCrypt/BCrypt.csproj
  7. +2 −3 src/CodeGeneration/CodeGeneration.csproj
  8. +1 −1 src/CodeGeneration/OfferFriendlyOverloadsGenerator.cs
  9. +1 −1 src/CodeGeneration/OfferIntPtrPropertyAccessorsGenerator.cs
  10. +1 −2 src/CodeGenerationAttributes/CodeGenerationAttributes.csproj
  11. +1 −2 src/Crypt32/Crypt32.csproj
  12. +1 −2 src/DbgHelp/DbgHelp.csproj
  13. +3 −4 src/Directory.Build.props
  14. +1 −2 src/DwmApi/DwmApi.csproj
  15. +1 −2 src/Fusion/Fusion.csproj
  16. +1 −2 src/Gdi32/Gdi32.csproj
  17. +1 −2 src/Hid/Hid.csproj
  18. +1 −2 src/ImageHlp/ImageHlp.csproj
  19. +1 −2 src/Kernel32/Kernel32.csproj
  20. +1 −2 src/MSCorEE/MSCorEE.csproj
  21. +1 −2 src/Magnification/Magnification.csproj
  22. +1 −2 src/Msi/Msi.csproj
  23. +1 −2 src/NCrypt/NCrypt.csproj
  24. +1 −2 src/NTDll/NTDll.csproj
  25. +1 −2 src/NetApi32/NetApi32.csproj
  26. +1 −2 src/Ole32/Ole32.csproj
  27. +1 −2 src/Psapi/Psapi.csproj
  28. +1 −2 src/SHCore/SHCore.csproj
  29. +1 −2 src/SetupApi/SetupApi.csproj
  30. +1 −2 src/Shell32/Shell32.csproj
  31. +1 −0 src/User32.Tests/User32Facts.cs
  32. +1 −2 src/User32/User32.csproj
  33. +1 −2 src/Userenv/Userenv.csproj
  34. +1 −2 src/UxTheme/UxTheme.csproj
  35. +1 −2 src/Win32/Win32.csproj
  36. +1 −2 src/Windows.Core/Windows.Core.csproj
  37. +1 −2 src/Windows.ShellScalingApi/Windows.ShellScalingApi.csproj
  38. +1 −2 src/WtsApi32/WtsApi32.csproj
  39. +7 −2 src/global.json
  40. +1 −2 templates/LIBNAME/LIBNAME.csproj
@@ -1,6 +1,16 @@
version: '{build}'
skip_tags: true
skip_branch_with_pr: true
branches:
only:
- master
- /^v\d+(?:\.\d+)?$/
- /[\b_]validate\b/
skip_commits:
files:
- doc/*
- '**/*.md'
- .vsts-ci.yml
os: Visual Studio 2017
configuration: Release
environment:
@@ -0,0 +1,95 @@
queue:
name: Hosted VS2017
timeoutInMinutes: 60
trigger:
branches:
include: ["master"]
paths:
exclude: [".github", "doc", "*.md", ".appveyor.yml"]
variables:
BuildConfiguration: Release
VisualStudioVersion: 15.0
GeneratePInvokesTxt: true
TreatWarningsAsErrors: true
ReportDir: bin\$(BuildConfiguration)
steps:
- task: BatchScript@1
inputs:
filename: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat
arguments: -no_logo
modifyEnvironment: true
displayName: Setup Environment Variables
- powershell: choco install pandoc
displayName: Install prerequisites
- powershell: .\build.ps1 -Restore
displayName: Restore packages
- powershell: .\build.ps1 -Configuration $(BuildConfiguration) -Build
displayName: Build
- powershell: .\build.ps1 -Configuration $(BuildConfiguration) -Test -NoParallelTests
displayName: Test
- powershell: |
tools\Get-CoverageReport.ps1 -NoBuild -Configuration $(BuildConfiguration) -OutFile "$(ReportDir)\coverage.md"
pandoc -f markdown -t html "$(ReportDir)\coverage.md" -o "$(ReportDir)\coverage.html"
displayName: Collect P/Invoke coverage report
- task: CopyFiles@2
displayName: 'Copy Files to: $(build.artifactstagingdirectory)\PInvoke coverage report'
inputs:
SourceFolder: $(ReportDir)
Contents: |
coverage.html
coverage.md
TargetFolder: $(build.artifactstagingdirectory)\PInvoke coverage report
- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: PInvoke coverage report'
inputs:
PathtoPublish: $(build.artifactstagingdirectory)\PInvoke coverage report
ArtifactName: PInvoke coverage report
- task: CopyFiles@2
displayName: 'Copy Files to: $(build.artifactstagingdirectory)\PInvoke method coverage'
inputs:
SourceFolder: bin
Contents: '**\*.pinvokes.txt'
TargetFolder: '$(build.artifactstagingdirectory)\PInvoke method coverage'
- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: PInvoke method coverage'
inputs:
PathtoPublish: $(build.artifactstagingdirectory)\PInvoke method coverage
ArtifactName: PInvoke method coverage
- task: CopyFiles@2
displayName: 'Copy Files to: $(build.artifactstagingdirectory)\Exported methods'
inputs:
SourceFolder: bin
Contents: '**\*.exports.txt'
TargetFolder: '$(build.artifactstagingdirectory)\Exported methods'
- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: Exported methods'
inputs:
PathtoPublish: $(build.artifactstagingdirectory)\Exported methods
ArtifactName: Exported methods
- task: CopyFiles@2
displayName: 'Copy Files to: $(build.artifactstagingdirectory)\NuGet packages'
inputs:
SourceFolder: bin
Contents: '**\*.nupkg'
TargetFolder: '$(build.artifactstagingdirectory)\NuGet packages'
- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: NuGet packages'
inputs:
PathtoPublish: $(build.artifactstagingdirectory)\NuGet packages
ArtifactName: NuGet packages
@@ -2,6 +2,7 @@ P/Invoke
=======
[![Build status](https://ci.appveyor.com/api/projects/status/idu56hy4jwytxd3x?branch=master&svg=true)](https://ci.appveyor.com/project/AArnott/pinvoke)
[![Build Status](https://andrewarnott.visualstudio.com/OSS/_apis/build/status/PInvoke)](https://andrewarnott.visualstudio.com/OSS/_build/latest?definitionId=6)
[![Join the chat at https://gitter.im/AArnott/pinvoke](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/AArnott/pinvoke?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Issue Stats][pull-requests-img]][pull-requests-url] [![Issue Stats][issues-closed-img]][issues-closed-url]
@@ -82,6 +82,7 @@ if ($Restore -and $PSCmdlet.ShouldProcess($SolutionFile, "Restore packages")) {
if ($Build -and $PSCmdlet.ShouldProcess($SolutionFile, "Build")) {
$buildArgs = @()
$buildArgs += $SolutionFile,'/nologo','/nr:false','/m','/v:minimal','/t:build,pack'
$buildArgs += "/p:Configuration=$Configuration"
$buildArgs += '/fl','/flp:verbosity=normal;logfile=msbuild.log','/flp1:warningsonly;logfile=msbuild.wrn;NoSummary;verbosity=minimal','/flp2:errorsonly;logfile=msbuild.err;NoSummary;verbosity=minimal'
if ($GeneratePInvokesTxt) {
$buildArgs += '/p:GeneratePInvokesTxt=true'
@@ -123,6 +124,7 @@ if ($Test -and $PSCmdlet.ShouldProcess('Test assemblies')) {
$xunitArgs = @()
$xunitArgs += $TestAssemblies
$xunitArgs += "-html","$BinTestsFolder\testresults.html","-xml","$BinTestsFolder\testresults.xml"
$xunitArgs += "-notrait",'"skiponcloud=true"'
if (!$NoParallelTests) {
$xunitArgs += "-parallel","all"
}
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
<StoreBanned>true</StoreBanned>
@@ -7,5 +7,5 @@
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,10 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFramework>netstandard1.5</TargetFramework>
<TargetFramework>netstandard1.6</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\CodeGenerationAttributes\FriendlyFlags.cs">
@@ -10,5 +10,4 @@
<ItemGroup>
<PackageReference Include="CodeGeneration.Roslyn" Version="$(CodeGenerationPackageVersion)" PrivateAssets="all" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -63,7 +63,7 @@ private enum GeneratorFlags
/// <inheritdoc />
public Task<SyntaxList<MemberDeclarationSyntax>> GenerateAsync(TransformationContext context, IProgress<Diagnostic> progress, CancellationToken cancellationToken)
{
var applyTo = context.ProcessingMember;
var applyTo = context.ProcessingNode;
var compilation = context.Compilation;
var semanticModel = compilation.GetSemanticModel(applyTo.SyntaxTree);
var type = (ClassDeclarationSyntax)applyTo;
@@ -35,7 +35,7 @@ public OfferIntPtrPropertyAccessorsGenerator(AttributeData data)
/// <inheritdoc />
public Task<SyntaxList<MemberDeclarationSyntax>> GenerateAsync(TransformationContext context, IProgress<Diagnostic> progress, CancellationToken cancellationToken)
{
var applyTo = context.ProcessingMember;
var applyTo = context.ProcessingNode;
var compilation = context.Compilation;
var applyToStruct = applyTo as StructDeclarationSyntax;
var applyToClass = applyTo as ClassDeclarationSyntax;
@@ -1,10 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PortableOnlyFrameworks);net20</TargetFrameworks>
<AssemblyName>CodeGenerationAttributes</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CodeGeneration.Roslyn.Attributes" Version="$(CodeGenerationPackageVersion)" PrivateAssets="all" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
</PropertyGroup>
@@ -7,5 +7,4 @@
<ProjectReference Include="..\NCrypt\NCrypt.csproj" />
<ProjectReference Include="..\AdvApi32\AdvApi32.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,9 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -35,8 +35,8 @@
<DefineConstants Condition=" '$(TargetsDesktop)' != 'true' ">$(DefineConstants);APISets</DefineConstants>
<CodeGenerationPackageVersion>0.4.6</CodeGenerationPackageVersion>
<NerdbankGitVersioningPackageVersion>2.1.23</NerdbankGitVersioningPackageVersion>
<CodeGenerationPackageVersion>0.4.65</CodeGenerationPackageVersion>
<NerdbankGitVersioningPackageVersion>2.2.13</NerdbankGitVersioningPackageVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetsDesktop)' == 'true' ">
@@ -66,14 +66,13 @@
</ItemDefinitionGroup>
<ItemGroup>
<GeneratorAssemblySearchPaths Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\netstandard1.5\" />
<GeneratorAssemblySearchPaths Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\netstandard1.6\" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json"/>
<None Include="$(MSBuildProjectName).exports.txt" Condition=" Exists('$(MSBuildProjectName).exports.txt') and '$(TargetFramework)' == 'net45' ">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.6" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="$(NerdbankGitVersioningPackageVersion)" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
</ItemGroup>
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
<StoreBanned>true</StoreBanned>
@@ -7,5 +7,4 @@
<ProjectReference Include="..\UxTheme\UxTheme.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
<StoreBanned>true</StoreBanned>
@@ -17,5 +17,4 @@
<EmbedInteropTypes>true</EmbedInteropTypes>
</COMFileReference>
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
<StoreBanned>true</StoreBanned>
@@ -7,5 +7,4 @@
<ProjectReference Include="..\User32\User32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
<StoreBanned>true</StoreBanned>
@@ -7,5 +7,4 @@
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
<StoreBanned>true</StoreBanned>
@@ -7,5 +7,4 @@
<ProjectReference Include="..\DbgHelp\DbgHelp.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,9 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
<StoreBanned>true</StoreBanned>
@@ -14,5 +14,4 @@
<EmbedInteropTypes>true</EmbedInteropTypes>
</COMFileReference>
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,9 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,10 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
<StoreBanned>true</StoreBanned>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
</PropertyGroup>
@@ -7,5 +7,4 @@
<ProjectReference Include="..\BCrypt\BCrypt.csproj" />
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
<StoreBanned>true</StoreBanned>
@@ -7,5 +7,4 @@
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
Oops, something went wrong.

0 comments on commit b5619d7

Please sign in to comment.