Move a bunch of files around to match the Library.Template

This commit is contained in:
Andrew Arnott 2022-10-30 14:14:22 -06:00
Родитель 4185a16ecb
Коммит 3db06b396f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: A9B9910CDCCDA441
134 изменённых файлов: 401 добавлений и 574 удалений

Просмотреть файл

@ -168,13 +168,14 @@ dotnet_diagnostic.SA1130.severity = silent
dotnet_diagnostic.IDE1006.severity = none
dotnet_diagnostic.DOC100.severity = silent
dotnet_diagnostic.DOC104.severity = warning
dotnet_diagnostic.DOC104.severity = silent # TODO: promote to warning
dotnet_diagnostic.DOC105.severity = warning
dotnet_diagnostic.DOC106.severity = warning
dotnet_diagnostic.DOC107.severity = warning
dotnet_diagnostic.DOC108.severity = warning
dotnet_diagnostic.DOC200.severity = warning
dotnet_diagnostic.DOC202.severity = warning
dotnet_diagnostic.DOC207.severity = silent # TODO: promote to warning
[*.sln]
indent_style = tab

Просмотреть файл

Просмотреть файл

@ -3,26 +3,21 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<RepoRootPath>$(MSBuildThisFileDirectory)</RepoRootPath>
<BaseIntermediateOutputPath>$(RepoRootPath)obj\$([MSBuild]::MakeRelative($(RepoRootPath), $(MSBuildProjectDirectory)))\</BaseIntermediateOutputPath>
<BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(RepoRootPath)bin\$(MSBuildProjectName)\</BaseOutputPath>
<PackageOutputPath>$(RepoRootPath)bin\Packages\$(Configuration)\</PackageOutputPath>
<BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(RepoRootPath)bin\</BaseOutputPath>
<PackageOutputPath>$(RepoRootPath)bin\$(Configuration)\Packages\</PackageOutputPath>
<LangVersion>10.0</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<AnalysisLevel>latest</AnalysisLevel>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<ProduceReferenceAssembly Condition=" '$(IsTestProject)' != 'true' ">true</ProduceReferenceAssembly>
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
<IsCodeGenerationProject Condition=" $(MSBuildProjectName.Contains('CodeGeneration')) ">true</IsCodeGenerationProject>
<IsPInvokeProject Condition=" '$(IsTestProject)' != 'true' and '$(IsCodeGenerationProject)' != 'true' ">true</IsPInvokeProject>
<IsPackable Condition=" '$(IsTestProject)' == 'true' or '$(IsCodeGenerationProject)' == 'true' ">false</IsPackable>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<!-- https://github.com/dotnet/msbuild/blob/main/documentation/ProjectReference-Protocol.md#setplatform-negotiation -->
<EnableDynamicPlatformResolution>true</EnableDynamicPlatformResolution>
<EnableDynamicPlatformResolution>false</EnableDynamicPlatformResolution>
<!-- Opt in till https://github.com/NuGet/Home/issues/9803 makes this the default. -->
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
<RestoreUseStaticGraphEvaluation>false</RestoreUseStaticGraphEvaluation>
<!-- This entire repo has just one version.json file, so compute the version once and share with all projects in a large build. -->
<GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
@ -59,18 +54,17 @@
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="all" />
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
<!-- Use the Unstable package ID so that update tools will help us keep it current even though it seems to be ever-unstable lately. -->
<PackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.435" PrivateAssets="all" />
<PackageReference Include="CSharpIsNullAnalyzer" Version="0.1.329" PrivateAssets="all" />
<PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" PrivateAssets="all" />
</ItemGroup>
<ItemGroup Condition=" '$(IsCodeGenerationProject)' != 'true' ">
<ProjectReference Include="..\CodeGenerationAttributes\CodeGenerationAttributes.csproj" PrivateAssets="all">
<ProjectReference Include="$(RepoRootPath)src\CodeGenerationAttributes\CodeGenerationAttributes.csproj" PrivateAssets="all">
<Private>false</Private>
<OutputItemType>Analyzer</OutputItemType>
</ProjectReference>
<ProjectReference Include="..\CodeGeneration\CodeGeneration.csproj">
<ProjectReference Include="$(RepoRootPath)src\CodeGeneration\CodeGeneration.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Analyzer</OutputItemType>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
@ -78,13 +72,6 @@
<Private>false</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
<PackageReference Include="coverlet.msbuild" Version="3.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="xunit" Version="2.4.1" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
@ -95,21 +82,6 @@
<AssemblyName>PInvoke.$(MSBuildProjectName)</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(IsTestProject)' == 'true' ">
<OutputPath>$(RepoRootPath)bin\$(Configuration)\tests\$(MSBuildProjectName)\</OutputPath>
<RootNamespace />
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)PInvoke.Tests.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup>
<!-- We build all libraries to a common directory, so avoid trying to copy P2P refs to the directory
to avoid wasting time with file collisions and build warnings. -->
<ProjectReference Condition=" '$(IsTestProject)' != 'true' ">
<!-- Sadly, enabling this optimization breaks loading the assembly later for exporting p/invoke method coverage. -->
<!-- <Private>false</Private> -->
</ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
<GeneratorAssemblySearchPaths Include="$(RepoRootPath)bin\$(Configuration)\netstandard2.0\" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)../stylecop.json"/>

Просмотреть файл

@ -5,7 +5,6 @@
</PropertyGroup>
<PropertyGroup>
<RootNamespace Condition=" '$(IsTestProject)' == 'true' " />
<ExcludeStoreBannedAPIs Condition=" ('$(TargetPlatformIdentifier)' == 'Windows' or '$(TargetPlatformIdentifier)' == 'UAP') and '$(TargetPlatformVersion)' >= 8.0 ">true</ExcludeStoreBannedAPIs>
<DefineConstants Condition=" '$(ExcludeStoreBannedAPIs)' != 'true' ">$(DefineConstants);IncludeStoreBannedAPIs</DefineConstants>
<DefineConstants Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' or ('$(TargetFrameworkIdentifier)' == '.NETStandard' and '$(_TargetFrameworkVersionWithoutV)' >= 2.0) ">$(DefineConstants);Serialization</DefineConstants>
@ -18,8 +17,6 @@
<ItemGroup>
<Compile Remove="storebanned\**" Condition=" '$(ExcludeStoreBannedAPIs)' == 'true' " />
<Compile Remove="**" Condition=" '$(ExcludeStoreBannedAPIs)' == 'true' and '$(StoreBanned)' == 'true' " />
<Compile Include="$(MSBuildThisFileDirectory)AssemblyAttributes.cs" Condition=" '$(IsPInvokeProject)' == 'true' " />
<Compile Include="$(MSBuildThisFileDirectory)AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(IsPInvokeProject)' == 'true' and '$(MSBuildProjectName)' != 'Win32' and '$(TargetFramework)' == 'net45' ">
@ -28,8 +25,6 @@
<AdditionalFiles Include="PublicAPI.Unshipped.txt" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)PInvoke.Extra.targets" Condition=" '$(IsTestProject)' != 'true' and '$(IsCodeGenerationProject)' != 'true' "/>
<!-- Workaround win8 .targets defining a target that should be blank (https://github.com/dotnet/sdk/issues/2517) -->
<Target Name="GetPackagingOutputs" />

Просмотреть файл

@ -4,164 +4,162 @@ VisualStudioVersion = 17.1.32119.435
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CD09C869-A027-4F21-B78F-22CF072B9C7F}"
ProjectSection(SolutionItems) = preProject
..\.editorconfig = ..\.editorconfig
..\.gitignore = ..\.gitignore
..\templates\AddNewCoreLibrary.ps1 = ..\templates\AddNewCoreLibrary.ps1
..\templates\AddNewLibrary.ps1 = ..\templates\AddNewLibrary.ps1
..\build.ps1 = ..\build.ps1
..\CONTRIBUTING.md = ..\CONTRIBUTING.md
..\CONTRIBUTORS.md = ..\CONTRIBUTORS.md
..\templates\CreateExportsTxtFile.ps1 = ..\templates\CreateExportsTxtFile.ps1
..\global.json = ..\global.json
..\LICENSE = ..\LICENSE
..\nuget.config = ..\nuget.config
PInvoke.ruleset = PInvoke.ruleset
PInvoke.Tests.ruleset = PInvoke.Tests.ruleset
..\README.md = ..\README.md
..\stylecop.json = ..\stylecop.json
..\tools\Update-CoverageReport.ps1 = ..\tools\Update-CoverageReport.ps1
..\version.json = ..\version.json
.editorconfig = .editorconfig
.gitignore = .gitignore
templates\AddNewCoreLibrary.ps1 = templates\AddNewCoreLibrary.ps1
templates\AddNewLibrary.ps1 = templates\AddNewLibrary.ps1
build.ps1 = build.ps1
CONTRIBUTING.md = CONTRIBUTING.md
CONTRIBUTORS.md = CONTRIBUTORS.md
templates\CreateExportsTxtFile.ps1 = templates\CreateExportsTxtFile.ps1
global.json = global.json
LICENSE = LICENSE
nuget.config = nuget.config
README.md = README.md
stylecop.json = stylecop.json
tools\Update-CoverageReport.ps1 = tools\Update-CoverageReport.ps1
version.json = version.json
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BCrypt", "BCrypt\BCrypt.csproj", "{9CE056E3-5D53-4092-97CC-78826A4D1C14}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BCrypt", "src\BCrypt\BCrypt.csproj", "{9CE056E3-5D53-4092-97CC-78826A4D1C14}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{F00A1FA3-A9AF-450E-A45C-AC59E108F45A}"
ProjectSection(SolutionItems) = preProject
..\tools\Create-PInvokeTxtFile.ps1 = ..\tools\Create-PInvokeTxtFile.ps1
tools\Create-PInvokeTxtFile.ps1 = tools\Create-PInvokeTxtFile.ps1
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
PInvoke.Extra.targets = PInvoke.Extra.targets
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Windows.Core", "Windows.Core\Windows.Core.csproj", "{B08C3C79-4CDD-4D37-933C-07D3452FD5F1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Windows.Core", "src\Windows.Core\Windows.Core.csproj", "{B08C3C79-4CDD-4D37-933C-07D3452FD5F1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "User32", "User32\User32.csproj", "{774A91D6-10C2-459C-A482-50D655BB4680}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "User32", "src\User32\User32.csproj", "{774A91D6-10C2-459C-A482-50D655BB4680}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gdi32", "Gdi32\Gdi32.csproj", "{BA62C4BC-1FB8-40E0-AC77-84663C4ED11A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gdi32", "src\Gdi32\Gdi32.csproj", "{BA62C4BC-1FB8-40E0-AC77-84663C4ED11A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kernel32", "Kernel32\Kernel32.csproj", "{1FDC092A-D3E8-4CC4-B896-17E0A213F723}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kernel32", "src\Kernel32\Kernel32.csproj", "{1FDC092A-D3E8-4CC4-B896-17E0A213F723}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kernel32.Tests", "Kernel32.Tests\Kernel32.Tests.csproj", "{D7224F5B-1AEE-4624-A71F-F0BB10C63555}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kernel32.Tests", "test\Kernel32.Tests\Kernel32.Tests.csproj", "{D7224F5B-1AEE-4624-A71F-F0BB10C63555}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hid", "Hid\Hid.csproj", "{26ABA748-B311-4094-9231-7490894E1157}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hid", "src\Hid\Hid.csproj", "{26ABA748-B311-4094-9231-7490894E1157}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hid.Tests", "Hid.Tests\Hid.Tests.csproj", "{6C21E31E-6E71-4CB8-8495-CC841B19947F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hid.Tests", "test\Hid.Tests\Hid.Tests.csproj", "{6C21E31E-6E71-4CB8-8495-CC841B19947F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetupApi", "SetupApi\SetupApi.csproj", "{A530587B-C0CD-408C-9FE1-AA3D36B760A0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetupApi", "src\SetupApi\SetupApi.csproj", "{A530587B-C0CD-408C-9FE1-AA3D36B760A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetupApi.Tests", "SetupApi.Tests\SetupApi.Tests.csproj", "{05468C6E-B6EB-45E9-9F3D-66207D9EFD41}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetupApi.Tests", "test\SetupApi.Tests\SetupApi.Tests.csproj", "{05468C6E-B6EB-45E9-9F3D-66207D9EFD41}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Windows.Core.Tests", "Windows.Core.Tests\Windows.Core.Tests.csproj", "{A44BC3C8-52A5-4372-8365-0C22FCB9E568}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Windows.Core.Tests", "test\Windows.Core.Tests\Windows.Core.Tests.csproj", "{A44BC3C8-52A5-4372-8365-0C22FCB9E568}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BCrypt.Tests", "BCrypt.Tests\BCrypt.Tests.csproj", "{5CDEA9DD-5A77-4B64-8F55-DC12EEFB3D3B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BCrypt.Tests", "test\BCrypt.Tests\BCrypt.Tests.csproj", "{5CDEA9DD-5A77-4B64-8F55-DC12EEFB3D3B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvApi32", "AdvApi32\AdvApi32.csproj", "{3FCBF2E0-1330-454C-8A17-AF14EBA6B244}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvApi32", "src\AdvApi32\AdvApi32.csproj", "{3FCBF2E0-1330-454C-8A17-AF14EBA6B244}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvApi32.Tests", "AdvApi32.Tests\AdvApi32.Tests.csproj", "{C7809FEC-FF01-4602-9CDD-E78832E35D67}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvApi32.Tests", "test\AdvApi32.Tests\AdvApi32.Tests.csproj", "{C7809FEC-FF01-4602-9CDD-E78832E35D67}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCrypt", "NCrypt\NCrypt.csproj", "{6AAA088F-2ADC-4FFD-8D11-D8B67D5EC88C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCrypt", "src\NCrypt\NCrypt.csproj", "{6AAA088F-2ADC-4FFD-8D11-D8B67D5EC88C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCrypt.Tests", "NCrypt.Tests\NCrypt.Tests.csproj", "{97F31BF5-B848-482C-B9B0-3717EF3029EA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCrypt.Tests", "test\NCrypt.Tests\NCrypt.Tests.csproj", "{97F31BF5-B848-482C-B9B0-3717EF3029EA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageHlp", "ImageHlp\ImageHlp.csproj", "{784B754D-20F0-464B-AEDC-DD7A3108FE25}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageHlp", "src\ImageHlp\ImageHlp.csproj", "{784B754D-20F0-464B-AEDC-DD7A3108FE25}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageHlp.Tests", "ImageHlp.Tests\ImageHlp.Tests.csproj", "{7A21FBC0-DFAC-4308-82AD-2F526DBFF636}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageHlp.Tests", "test\ImageHlp.Tests\ImageHlp.Tests.csproj", "{7A21FBC0-DFAC-4308-82AD-2F526DBFF636}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbgHelp", "DbgHelp\DbgHelp.csproj", "{26A6F480-5ED3-48B8-9BBA-243115672098}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbgHelp", "src\DbgHelp\DbgHelp.csproj", "{26A6F480-5ED3-48B8-9BBA-243115672098}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbgHelp.Tests", "DbgHelp.Tests\DbgHelp.Tests.csproj", "{9EC79974-4353-411E-A04F-598474D9CE58}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbgHelp.Tests", "test\DbgHelp.Tests\DbgHelp.Tests.csproj", "{9EC79974-4353-411E-A04F-598474D9CE58}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Psapi.Tests", "Psapi.Tests\Psapi.Tests.csproj", "{2C8088B3-82BD-4784-B917-435838A2B1D5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Psapi.Tests", "test\Psapi.Tests\Psapi.Tests.csproj", "{2C8088B3-82BD-4784-B917-435838A2B1D5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Psapi", "Psapi\Psapi.csproj", "{6AB26806-6A22-456D-AD87-CD8B3FAFA216}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Psapi", "src\Psapi\Psapi.csproj", "{6AB26806-6A22-456D-AD87-CD8B3FAFA216}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGeneration", "CodeGeneration\CodeGeneration.csproj", "{C1815471-02AF-4BB9-8D83-652ADBAFF5B6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGeneration", "src\CodeGeneration\CodeGeneration.csproj", "{C1815471-02AF-4BB9-8D83-652ADBAFF5B6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGenerationAttributes", "CodeGenerationAttributes\CodeGenerationAttributes.csproj", "{1387E009-7086-4572-AC8D-CE4242ADEC77}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGenerationAttributes", "src\CodeGenerationAttributes\CodeGenerationAttributes.csproj", "{1387E009-7086-4572-AC8D-CE4242ADEC77}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeGen", "CodeGen", "{BC58E358-D202-41B7-BDC3-38E084F36F0B}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeGen", "src\CodeGen", "{BC58E358-D202-41B7-BDC3-38E084F36F0B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSCorEE", "MSCorEE\MSCorEE.csproj", "{862717F8-F2DF-4DE8-9F03-5A98941B2747}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSCorEE", "src\MSCorEE\MSCorEE.csproj", "{862717F8-F2DF-4DE8-9F03-5A98941B2747}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSCorEE.Tests", "MSCorEE.Tests\MSCorEE.Tests.csproj", "{A0070AA5-6122-4D81-8A21-EAE6069D2871}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSCorEE.Tests", "test\MSCorEE.Tests\MSCorEE.Tests.csproj", "{A0070AA5-6122-4D81-8A21-EAE6069D2871}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crypt32", "Crypt32\Crypt32.csproj", "{2355A580-2257-4A41-B7EC-F987993CE0C9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crypt32", "src\Crypt32\Crypt32.csproj", "{2355A580-2257-4A41-B7EC-F987993CE0C9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crypt32.Tests", "Crypt32.Tests\Crypt32.Tests.csproj", "{BA90133E-FE3B-4FA0-84A1-79D5F90D1BEA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crypt32.Tests", "test\Crypt32.Tests\Crypt32.Tests.csproj", "{BA90133E-FE3B-4FA0-84A1-79D5F90D1BEA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NTDll", "NTDll\NTDll.csproj", "{F64C8B26-5E30-4A7A-8643-F58E4602C64A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NTDll", "src\NTDll\NTDll.csproj", "{F64C8B26-5E30-4A7A-8643-F58E4602C64A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NTDll.Tests", "NTDll.Tests\NTDll.Tests.csproj", "{F580109D-3C86-4CE4-B686-53F2A3CB1314}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NTDll.Tests", "test\NTDll.Tests\NTDll.Tests.csproj", "{F580109D-3C86-4CE4-B686-53F2A3CB1314}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UxTheme", "UxTheme\UxTheme.csproj", "{3D1C8CE4-27F5-42BB-A7BD-CD5DEAB58EF3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UxTheme", "src\UxTheme\UxTheme.csproj", "{3D1C8CE4-27F5-42BB-A7BD-CD5DEAB58EF3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UxTheme.Tests", "UxTheme.Tests\UxTheme.Tests.csproj", "{79E61C04-D712-47ED-B070-A56E5CD7A258}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UxTheme.Tests", "test\UxTheme.Tests\UxTheme.Tests.csproj", "{79E61C04-D712-47ED-B070-A56E5CD7A258}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Userenv", "Userenv\Userenv.csproj", "{FDA184C9-C55D-4615-BCF5-ADBF59F25102}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Userenv", "src\Userenv\Userenv.csproj", "{FDA184C9-C55D-4615-BCF5-ADBF59F25102}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Userenv.Tests", "Userenv.Tests\Userenv.Tests.csproj", "{7757DDC1-E0DF-43B6-AD91-40C1F324521E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Userenv.Tests", "test\Userenv.Tests\Userenv.Tests.csproj", "{7757DDC1-E0DF-43B6-AD91-40C1F324521E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "User32.Tests", "User32.Tests\User32.Tests.csproj", "{F7D62BDA-629B-41A7-8233-4AB95B2AD7BA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "User32.Tests", "test\User32.Tests\User32.Tests.csproj", "{F7D62BDA-629B-41A7-8233-4AB95B2AD7BA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DwmApi", "DwmApi\DwmApi.csproj", "{AA9EADF7-B399-4DC3-B616-5E0B8A796DFE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DwmApi", "src\DwmApi\DwmApi.csproj", "{AA9EADF7-B399-4DC3-B616-5E0B8A796DFE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DwmApi.Tests", "DwmApi.Tests\DwmApi.Tests.csproj", "{4B835D69-B10B-4F53-80DE-AC392CEFB896}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DwmApi.Tests", "test\DwmApi.Tests\DwmApi.Tests.csproj", "{4B835D69-B10B-4F53-80DE-AC392CEFB896}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fusion", "Fusion\Fusion.csproj", "{A41C96AD-3E4A-4744-AA3D-00FFE07954AD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fusion", "src\Fusion\Fusion.csproj", "{A41C96AD-3E4A-4744-AA3D-00FFE07954AD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fusion.Tests", "Fusion.Tests\Fusion.Tests.csproj", "{E2D45BD5-5657-48F6-AAD7-3694B46BED08}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fusion.Tests", "test\Fusion.Tests\Fusion.Tests.csproj", "{E2D45BD5-5657-48F6-AAD7-3694B46BED08}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Msi", "Msi\Msi.csproj", "{01174E89-DE65-47DC-BF53-4E2CF34AD843}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Msi", "src\Msi\Msi.csproj", "{01174E89-DE65-47DC-BF53-4E2CF34AD843}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Msi.Tests", "Msi.Tests\Msi.Tests.csproj", "{046AD8A6-AAFC-4089-B536-C16256BB9CF6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Msi.Tests", "test\Msi.Tests\Msi.Tests.csproj", "{046AD8A6-AAFC-4089-B536-C16256BB9CF6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetApi32", "NetApi32\NetApi32.csproj", "{9C5AE8E9-330A-47D9-84D8-9883880EBE9E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetApi32", "src\NetApi32\NetApi32.csproj", "{9C5AE8E9-330A-47D9-84D8-9883880EBE9E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetApi32.Tests", "NetApi32.Tests\NetApi32.Tests.csproj", "{DF7FD89E-5352-4674-8FC3-5BA3605E9154}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetApi32.Tests", "test\NetApi32.Tests\NetApi32.Tests.csproj", "{DF7FD89E-5352-4674-8FC3-5BA3605E9154}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shell32", "Shell32\Shell32.csproj", "{F187990F-4B3F-4F08-8179-A39A8708D2B5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shell32", "src\Shell32\Shell32.csproj", "{F187990F-4B3F-4F08-8179-A39A8708D2B5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shell32.Tests", "Shell32.Tests\Shell32.Tests.csproj", "{FDEFD0A0-2E13-4CB7-92F1-74DD216785E5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shell32.Tests", "test\Shell32.Tests\Shell32.Tests.csproj", "{FDEFD0A0-2E13-4CB7-92F1-74DD216785E5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SHCore", "SHCore\SHCore.csproj", "{4D9D4B01-3D46-4BC6-B93F-A799B8C21ABF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SHCore", "src\SHCore\SHCore.csproj", "{4D9D4B01-3D46-4BC6-B93F-A799B8C21ABF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SHCore.Tests", "SHCore.Tests\SHCore.Tests.csproj", "{49094447-F41D-4026-92E3-124532958876}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SHCore.Tests", "test\SHCore.Tests\SHCore.Tests.csproj", "{49094447-F41D-4026-92E3-124532958876}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Windows.ShellScalingApi", "Windows.ShellScalingApi\Windows.ShellScalingApi.csproj", "{0500E681-818F-4366-B2A5-0BB73D7864C6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Windows.ShellScalingApi", "src\Windows.ShellScalingApi\Windows.ShellScalingApi.csproj", "{0500E681-818F-4366-B2A5-0BB73D7864C6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WtsApi32", "WtsApi32\WtsApi32.csproj", "{BF4E3E19-7145-4D41-8906-084216599537}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WtsApi32", "src\WtsApi32\WtsApi32.csproj", "{BF4E3E19-7145-4D41-8906-084216599537}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WtsApi32.Tests", "WtsApi32.Tests\WtsApi32.Tests.csproj", "{851B8946-8DE1-41F5-A857-BA9428B494DC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WtsApi32.Tests", "test\WtsApi32.Tests\WtsApi32.Tests.csproj", "{851B8946-8DE1-41F5-A857-BA9428B494DC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win32", "Win32\Win32.csproj", "{34C97C6A-0323-44C6-B8E6-ED748CA287D5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win32", "src\Win32\Win32.csproj", "{34C97C6A-0323-44C6-B8E6-ED748CA287D5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magnification", "Magnification\Magnification.csproj", "{B9778D6F-25D9-4B3B-B752-A326F2801EC2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magnification", "src\Magnification\Magnification.csproj", "{B9778D6F-25D9-4B3B-B752-A326F2801EC2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magnification.Tests", "Magnification.Tests\Magnification.Tests.csproj", "{9E6F16CF-7C21-4C6C-AC06-8933A02F99A6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magnification.Tests", "test\Magnification.Tests\Magnification.Tests.csproj", "{9E6F16CF-7C21-4C6C-AC06-8933A02F99A6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ole32", "Ole32\Ole32.csproj", "{25A2D0B9-5110-4C58-A872-33E7FD9827F0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ole32", "src\Ole32\Ole32.csproj", "{25A2D0B9-5110-4C58-A872-33E7FD9827F0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ole32.Tests", "Ole32.Tests\Ole32.Tests.csproj", "{8B01C254-2EF7-4724-AFD7-FAD39BE69618}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ole32.Tests", "test\Ole32.Tests\Ole32.Tests.csproj", "{8B01C254-2EF7-4724-AFD7-FAD39BE69618}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cabinet", "Cabinet\Cabinet.csproj", "{966BE4C3-657F-4D2C-8717-C04804064186}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cabinet", "src\Cabinet\Cabinet.csproj", "{966BE4C3-657F-4D2C-8717-C04804064186}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cabinet.Tests", "Cabinet.Tests\Cabinet.Tests.csproj", "{12C7FC54-61AA-413E-A53F-B7AD5D738C70}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cabinet.Tests", "test\Cabinet.Tests\Cabinet.Tests.csproj", "{12C7FC54-61AA-413E-A53F-B7AD5D738C70}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IPHlpApi", "IPHlpApi\IPHlpApi.csproj", "{F00E1C9E-300A-4D42-9128-DDF6307AF0B1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IPHlpApi", "src\IPHlpApi\IPHlpApi.csproj", "{F00E1C9E-300A-4D42-9128-DDF6307AF0B1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IPHlpApi.Tests", "IPHlpApi.Tests\IPHlpApi.Tests.csproj", "{4E6F62D4-F647-4DB5-B68F-32D74B1DA3AE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IPHlpApi.Tests", "test\IPHlpApi.Tests\IPHlpApi.Tests.csproj", "{4E6F62D4-F647-4DB5-B68F-32D74B1DA3AE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewDev", "NewDev\NewDev.csproj", "{31CBB60E-1C8C-442A-8EF4-CD03405F23E1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewDev", "src\NewDev\NewDev.csproj", "{31CBB60E-1C8C-442A-8EF4-CD03405F23E1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewDev.Tests", "NewDev.Tests\NewDev.Tests.csproj", "{AC073C9F-A06E-49F5-A7E8-D0BECF0AD30D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewDev.Tests", "test\NewDev.Tests\NewDev.Tests.csproj", "{AC073C9F-A06E-49F5-A7E8-D0BECF0AD30D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUsb", "WinUsb\WinUsb.csproj", "{7E3C9790-DF5F-4B77-B8D0-1389612FB6A1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUsb", "src\WinUsb\WinUsb.csproj", "{7E3C9790-DF5F-4B77-B8D0-1389612FB6A1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUsb.Tests", "WinUsb.Tests\WinUsb.Tests.csproj", "{1F5458CE-CD32-41FA-B946-A3D9983C57E5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUsb.Tests", "test\WinUsb.Tests\WinUsb.Tests.csproj", "{1F5458CE-CD32-41FA-B946-A3D9983C57E5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CfgMgr32", "CfgMgr32\CfgMgr32.csproj", "{970EAFB3-FA7E-415C-8012-7A0005D75AF9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CfgMgr32", "src\CfgMgr32\CfgMgr32.csproj", "{970EAFB3-FA7E-415C-8012-7A0005D75AF9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CfgMgr32.Tests", "CfgMgr32.Tests\CfgMgr32.Tests.csproj", "{A79234FB-C783-4003-AD26-C4FB388D9310}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CfgMgr32.Tests", "test\CfgMgr32.Tests\CfgMgr32.Tests.csproj", "{A79234FB-C783-4003-AD26-C4FB388D9310}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Просмотреть файл

Просмотреть файл

@ -25,6 +25,7 @@ variables:
codecov_token: 4dc9e7e2-6b01-4932-a180-847b52b43d35 # Get a new one from https://codecov.io/
ci_feed: https://pkgs.dev.azure.com/andrewarnott/OSS/_packaging/PublicCI/nuget/v3/index.json
NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages/
GeneratePInvokesTxt: true
jobs:
- template: azure-pipelines/build.yml

Просмотреть файл

@ -38,6 +38,7 @@ Get-ChildItem "$PSScriptRoot\*.ps1" -Exclude "_*" -Recurse | % {
$ArtifactName = $_.BaseName
if ($Force -or !(Test-ArtifactStaged($ArtifactName + $ArtifactNameSuffix))) {
$totalFileCount = 0
Write-Verbose "Collecting file list for artifact $($_.BaseName)"
$fileGroups = & $_
if ($fileGroups) {
$fileGroups.GetEnumerator() | % {

Просмотреть файл

@ -4,7 +4,7 @@ if (!$BuildConfiguration) {
$BuildConfiguration = 'Debug'
}
$PackagesRoot = "$RepoRoot/bin/Packages/$BuildConfiguration"
$PackagesRoot = "$RepoRoot/bin/$BuildConfiguration/Packages"
if (!(Test-Path $PackagesRoot)) { return }

Просмотреть файл

@ -6,7 +6,7 @@ if (!$BuildConfiguration) {
$binRoot = "$RepoRoot\bin\$BuildConfiguration"
tools\Get-CoverageReport.ps1 -NoBuild -Configuration $env:configuration -OutFile "$binRoot\coverage.md"
& "$PSScriptRoot\..\..\tools\Get-CoverageReport.ps1" -NoBuild -Configuration $env:configuration -OutFile "$binRoot\coverage.md"
& (& "$PSScriptRoot\..\Get-pandoc.ps1") -f markdown -t html "$binRoot\coverage.md" -o "$binRoot\coverage.html"

Просмотреть файл

@ -24,21 +24,6 @@ jobs:
- template: dotnet.yml
parameters:
RunTests: ${{ parameters.RunTests }}
- template: expand-template.yml
- job: WrapUp
dependsOn:
- Windows
pool: ${{ parameters.windowsPool }} # Use Windows agent because PublishSymbols task requires it (https://github.com/microsoft/azure-pipelines-tasks/issues/13821).
condition: succeededOrFailed()
steps:
- checkout: self
fetchDepth: 0 # avoid shallow clone so nbgv can do its work.
clean: true
- template: install-dependencies.yml
parameters:
initArgs: -NoRestore
- template: publish-symbols.yml
- ${{ if parameters.RunTests }}:
- template: publish-codecoverage.yml
- template: publish-deployables.yml

Просмотреть файл

@ -1,83 +0,0 @@
#!/usr/bin/env pwsh
<#
.SYNOPSIS
Runs tests as they are run in cloud test runs.
.PARAMETER Configuration
The configuration within which to run tests
.PARAMETER Agent
The name of the agent. This is used in preparing test run titles.
.PARAMETER PublishResults
A switch to publish results to Azure Pipelines.
.PARAMETER x86
A switch to run the tests in an x86 process.
.PARAMETER dotnet32
The path to a 32-bit dotnet executable to use.
#>
[CmdletBinding()]
Param(
[string]$Configuration='Debug',
[string]$Agent='Local',
[switch]$PublishResults,
[switch]$x86,
[string]$dotnet32
)
$RepoRoot = (Resolve-Path "$PSScriptRoot/..").Path
$ArtifactStagingFolder = & "$PSScriptRoot/Get-ArtifactsStagingDirectory.ps1"
$dotnet = 'dotnet'
if ($x86) {
$x86RunTitleSuffix = ", x86"
if ($dotnet32) {
$dotnet = $dotnet32
} else {
$dotnet32Possibilities = "$PSScriptRoot\../obj/tools/x86/.dotnet/dotnet.exe", "$env:AGENT_TOOLSDIRECTORY/x86/dotnet/dotnet.exe", "${env:ProgramFiles(x86)}\dotnet\dotnet.exe"
$dotnet32Matches = $dotnet32Possibilities |? { Test-Path $_ }
if ($dotnet32Matches) {
$dotnet = Resolve-Path @($dotnet32Matches)[0]
Write-Host "Running tests using `"$dotnet`"" -ForegroundColor DarkGray
} else {
Write-Error "Unable to find 32-bit dotnet.exe"
return 1
}
}
}
& $dotnet test $RepoRoot `
--no-build `
-c $Configuration `
--filter "TestCategory!=FailsInCloudTest" `
--collect "Code Coverage;Format=cobertura" `
--settings "$PSScriptRoot/test.runsettings" `
--blame-hang-timeout 60s `
--blame-crash `
-bl:"$ArtifactStagingFolder/build_logs/test.binlog" `
--diag "$ArtifactStagingFolder/test_logs/diag.log;TraceLevel=info" `
--logger trx `
$unknownCounter = 0
Get-ChildItem -Recurse -Path $RepoRoot\test\*.trx |% {
Copy-Item $_ -Destination $ArtifactStagingFolder/test_logs/
if ($PublishResults) {
$x = [xml](Get-Content -Path $_)
$runTitle = $null
if ($x.TestRun.TestDefinitions -and $x.TestRun.TestDefinitions.GetElementsByTagName('UnitTest')) {
$storage = $x.TestRun.TestDefinitions.GetElementsByTagName('UnitTest')[0].storage -replace '\\','/'
if ($storage -match '/(?<tfm>net[^/]+)/(?:(?<rid>[^/]+)/)?(?<lib>[^/]+)\.dll$') {
if ($matches.rid) {
$runTitle = "$($matches.lib) ($($matches.tfm), $($matches.rid), $Agent)"
} else {
$runTitle = "$($matches.lib) ($($matches.tfm)$x86RunTitleSuffix, $Agent)"
}
}
}
if (!$runTitle) {
$unknownCounter += 1;
$runTitle = "unknown$unknownCounter ($Agent$x86RunTitleSuffix)";
}
Write-Host "##vso[results.publish type=VSTest;runTitle=$runTitle;publishRunAttachments=true;resultFiles=$_;failTaskOnFailedTests=true;testRunSystem=VSTS - PTR;]"
}
}

Просмотреть файл

@ -4,17 +4,32 @@ parameters:
steps:
- task: VSBuild@1
displayName: 🛠 msbuild
displayName: 🛠 Build
inputs:
msbuildArgs: /t:build,pack /m /v:m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/msbuild.binlog"
platform: Any CPU
configuration: $(BuildConfiguration)
- powershell: .\build.ps1 -Test
displayName: 🧪 test
displayName: 🧪 Test
failOnStderr: true
condition: and(succeeded(), ${{ parameters.RunTests }})
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
- pwsh: >
dotnet tool install --tool-path obj SignClient
obj/SignClient sign
--baseDirectory '$(System.DefaultWorkingDirectory)/bin/$(BuildConfiguration)/Packages'
--input '**/*'
--config '$(System.DefaultWorkingDirectory)/azure-pipelines/SignClient.json'
--filelist '$(System.DefaultWorkingDirectory)/azure-pipelines/signfiles.txt'
--user '$(codesign_username)'
--secret '$(codesign_secret)'
--name 'PInvoke'
--descriptionUrl 'https://github.com/dotnet/pinvoke'
displayName: 🖊️ Code sign
- powershell: azure-pipelines/variables/_pipelines.ps1
failOnStderr: true
displayName: ⚙ Update pipeline variables based on build outputs

Просмотреть файл

@ -1,8 +1,5 @@
steps:
- download: current
displayName: 🔻 Download deployables
artifact: deployables-Windows
- powershell: dotnet nuget push "$(Resolve-Path '$(Pipeline.Workspace)\deployables-Windows\')*.nupkg" -s $(ci_feed) -k azdo --skip-duplicate
displayName: 📦 Push packages to CI feed
condition: and(succeeded(), ne(variables['ci_feed'], ''), ne(variables['Build.Reason'], 'PullRequest'))
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
- powershell: dotnet nuget push "$(Resolve-Path '$(Build.ArtifactStagingDirectory)\deployables-Windows\')*.nupkg" -s $(ci_feed) -k azdo --skip-duplicate
displayName: 📦 Push packages to CI feed
condition: and(succeeded(), ne(variables['ci_feed'], ''))

Просмотреть файл

@ -1,21 +1,7 @@
steps:
- task: DownloadPipelineArtifact@2
inputs:
artifact: symbols-Windows
path: $(Pipeline.Workspace)/symbols/Windows
displayName: 🔻 Download Windows symbols
continueOnError: true
- task: DownloadPipelineArtifact@2
inputs:
artifact: test_symbols-Windows
path: $(Pipeline.Workspace)/test_symbols/Windows
displayName: 🔻 Download Windows test symbols
continueOnError: true
- task: PublishSymbols@2
inputs:
SymbolsFolder: $(Pipeline.Workspace)/symbols
SymbolsFolder: $(Build.ArtifactStagingDirectory)/symbols-$(Agent.JobName)
SearchPattern: '**/*.pdb'
IndexSources: false
SymbolServerType: TeamServices
@ -23,7 +9,7 @@ steps:
- task: PublishSymbols@2
inputs:
SymbolsFolder: $(Pipeline.Workspace)/test_symbols
SymbolsFolder: $(Build.ArtifactStagingDirectory)/test_symbols-$(Agent.JobName)
SearchPattern: '**/*.pdb'
IndexSources: false
SymbolServerType: TeamServices

Просмотреть файл

@ -45,7 +45,7 @@ if ($NothingToDo) {
# Path variables
$ProjectRoot = Split-Path -parent $PSCommandPath
$SolutionFolder = Join-Path $ProjectRoot src
$SolutionFolder = $ProjectRoot
$SolutionFile = Join-Path $SolutionFolder "PInvoke.sln"
$BinFolder = Join-Path $ProjectRoot "bin"
$BinConfigFolder = Join-Path $BinFolder $Configuration
@ -111,7 +111,7 @@ if (($Build -or $Rebuild) -and $PSCmdlet.ShouldProcess($SolutionFile, "Build"))
}
if ($Test -and $PSCmdlet.ShouldProcess('Test assemblies')) {
$TestAssemblies = Get-ChildItem -Recurse "$BinTestsFolder\*.Tests.dll" |? { $_.Directory -notlike '*netcoreapp*' }
$TestAssemblies = Get-ChildItem -Recurse "$BinTestsFolder\*.Tests.dll" |? { ($_.Directory -notlike '*netcoreapp*') -and ($_.Directory -like "*$Configuration*") }
$xunitArgs = @()
$xunitArgs += $TestAssemblies
$xunitArgs += "-html","$BinTestsFolder\testresults.html","-xml","$BinTestsFolder\testresults.xml"

Просмотреть файл

@ -0,0 +1,8 @@
[*.cs]
dotnet_diagnostic.SA1307.severity = none
dotnet_diagnostic.SA1310.severity = none
dotnet_diagnostic.SA1313.severity = none
dotnet_diagnostic.SA1600.severity = silent
dotnet_diagnostic.SA1602.severity = silent
dotnet_diagnostic.SA1629.severity = silent # info
dotnet_diagnostic.SA1649.severity = silent # info

Просмотреть файл

@ -1,13 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\AdvApi32\AdvApi32.csproj" />
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,16 +0,0 @@
// Copyright © .NET Foundation and Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if NETFRAMEWORK || NETSTANDARD
using System.Runtime.InteropServices;
[module: DefaultCharSet(CharSet.Unicode)]
#if NET45_ORLATER || NETSTANDARD
[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
#endif
#endif

Просмотреть файл

@ -1,6 +1,16 @@
// Copyright (c) COMPANY-PLACEHOLDER. All rights reserved.
// Copyright © .NET Foundation and Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if NETFRAMEWORK || NETSTANDARD
using System.Runtime.InteropServices;
[module: DefaultCharSet(CharSet.Unicode)]
#if NET45_ORLATER || NETSTANDARD
[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.SafeDirectories)]
#endif
#endif

Просмотреть файл

@ -1,13 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\BCrypt\BCrypt.csproj" />
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>$(PlatformAndPortableFrameworks)</TargetFrameworks>
<CodeAnalysisRuleSet>BCrypt.ruleset</CodeAnalysisRuleSet>
<NoWarn>$(NoWarn);RS0026;RS0027</NoWarn>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />

Просмотреть файл

@ -1,3 +1,18 @@
<Project>
<PropertyGroup>
<IsCodeGenerationProject Condition=" $(MSBuildProjectName.Contains('CodeGeneration')) ">true</IsCodeGenerationProject>
<IsPInvokeProject Condition=" '$(IsCodeGenerationProject)' != 'true' ">true</IsPInvokeProject>
<IsPackable Condition=" '$(IsCodeGenerationProject)' == 'true' ">false</IsPackable>
</PropertyGroup>
<ItemDefinitionGroup>
<!-- We build all libraries to a common directory, so avoid trying to copy P2P refs to the directory
to avoid wasting time with file collisions and build warnings. -->
<ProjectReference>
<!-- Sadly, enabling this optimization breaks loading the assembly later for exporting p/invoke method coverage. -->
<!-- <Private>false</Private> -->
</ProjectReference>
</ItemDefinitionGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))\Directory.Build.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))' != '' " />
</Project>

Просмотреть файл

@ -3,5 +3,7 @@
<Compile Include="$(MSBuildThisFileDirectory)AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)PInvoke.Extra.targets" Condition=" '$(IsCodeGenerationProject)' != 'true' "/>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.targets))\Directory.Build.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.targets))' != '' " />
</Project>

Просмотреть файл

@ -1,12 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\DwmApi\DwmApi.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,12 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Fusion\Fusion.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,12 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Hid\Hid.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,12 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\DbgHelp\DbgHelp.csproj" />
<ProjectReference Include="..\ImageHlp\ImageHlp.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,12 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,12 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
<ProjectReference Include="..\Magnification\Magnification.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Msi\Msi.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,12 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\NTDll\NTDll.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\NetApi32\NetApi32.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,12 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
<ProjectReference Include="..\Ole32\Ole32.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Psapi\Psapi.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\SHCore\SHCore.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\SetupApi\SetupApi.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Shell32\Shell32.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\User32\User32.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Userenv\Userenv.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\UxTheme\UxTheme.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\WtsApi32\WtsApi32.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -3,11 +3,11 @@
Adds the class library and NuGet projects necessary to support a new core library
to the solution.
A Core Library on PInvoke project wording is a library that only contains types and structures,
no functions, classes or methods. These kind of projects are meant to be used when types and
structures must be shared among other high level projects, like SHCore and User32 share Windows.ShellScalingApi.
A Core Library on PInvoke project wording is a library that only contains types and structures,
no functions, classes or methods. These kind of projects are meant to be used when types and
structures must be shared among other high level projects, like SHCore and User32 share Windows.ShellScalingApi.
Core Libraries should be named after their C/C++ header file names like ShellScalingApi.h
Core Libraries should be named after their C/C++ header file names like ShellScalingApi.h
.PARAMETER CoreLibraryName
The name of the core library you are introducing support for, without the .dll extension.
@ -45,9 +45,8 @@ $Replacements = @{
Copy-Item -Recurse -Path $TemplateDirectories -Destination $Src
$SrcDirectories |% { Replace-Placeholders -LibraryName $CoreLibraryName -Replacements $Replacements -Path $_ }
dotnet sln $PSScriptRoot\.. add $Src\$CoreLibraryName --in-root
dotnet add $Src\win32 reference $Src\$CoreLibraryName
Write-Output "Great. Your new projects have been created. Please also perform a few more manual steps:"
Write-Output "1. Add this new project to your solution file:"
Write-Output " $Src\$CoreLibraryName\$CoreLibraryName.csproj"
Write-Output "2. Add your library to the README.md file."
Write-Output "3. Add a project reference to $Src\$CoreLibraryName\$CoreLibraryName.csproj"
Write-Output " into the Win32 project, if it's part of the Win32 API."
Write-Output "1. Add your library to the README.md file."

Просмотреть файл

@ -23,33 +23,36 @@ if (!(Get-Command dumpbin)) {
. $PSScriptRoot\Replace-Placeholders.ps1
$Src = Resolve-Path "$PSScriptRoot\..\src"
$Test = Resolve-Path "$PSScriptRoot\..\test"
$Directories = 'LIBNAME','LIBNAME.Tests'
$TemplateDirectories = @()
$SrcDirectories = @()
foreach($dir in $Directories) {
$SrcDirectory = "$Src\$dir"
$IsTest = $dir -Like '*test*'
if ($IsTest) {
$SrcDirectory = "$Test\$dir"
} else {
$SrcDirectory = "$Src\$dir"
}
$TemplateDirectory = "$PSScriptRoot\$dir"
$SrcDirectory_Substituted = $SrcDirectory.Replace('LIBNAME', $LibraryName)
If (-not (Test-Path $SrcDirectory_Substituted)) {
$TemplateDirectories += $TemplateDirectory
$SrcDirectories += $SrcDirectory
}
Copy-Item -Recurse -Path $TemplateDirectory -Destination $SrcDirectory
}
$Replacements = @{
'LIBNAME' = $LibraryName;
}
Copy-Item -Recurse -Path $TemplateDirectories -Destination $Src
$SrcDirectories |% { Replace-Placeholders -LibraryName $LibraryName -Replacements $Replacements -Path $_ }
& "$PSScriptRoot\CreateExportsTxtFile.ps1" -AssemblyPath "$env:windir\System32\$LibraryName.dll" -OutputDir "$Src\$LibraryName\"
dotnet sln $PSScriptRoot\.. add $Src\$LibraryName --in-root
dotnet sln $PSScriptRoot\.. add $Test\$LibraryName.Tests --in-root
dotnet add $Src\win32 reference $Src\$LibraryName
Write-Output "Great. Your new projects have been created. Please also perform a few more manual steps:"
Write-Output "1. Add these new projects to your solution file:"
Write-Output " $Src\$LibraryName\$LibraryName.csproj"
Write-Output " $Src\$LibraryName.Tests\$LibraryName.Tests.csproj"
Write-Output "2. Add your library to the README.md file."
Write-Output "3. Add a project reference to $Src\$CoreLibraryName\$CoreLibraryName.csproj"
Write-Output " into the Win32 project, if it's part of the Win32 API."
Write-Output "1. Add your library to the README.md file."

Просмотреть файл

@ -3,10 +3,7 @@
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
<ProjectReference Include="..\LIBNAME\LIBNAME.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
<ProjectReference Include="..\..\src\LIBNAME\LIBNAME.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\AdvApi32\AdvApi32.csproj" />
<ProjectReference Include="..\..\src\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\BCrypt\BCrypt.csproj" />
<ProjectReference Include="..\..\src\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -3,9 +3,9 @@
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Cabinet\Cabinet.csproj" />
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
<ProjectReference Include="..\..\src\Cabinet\Cabinet.csproj" />
<ProjectReference Include="..\..\src\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="demo.CAB">

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\CfgMgr32\CfgMgr32.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -3,13 +3,10 @@
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Crypt32\Crypt32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
<ProjectReference Include="..\..\src\Crypt32\Crypt32.csproj" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.pfx" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\DbgHelp\DbgHelp.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -1,9 +1,21 @@
<Project>
<PropertyGroup>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))\Directory.Build.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))' != '' " />
<PropertyGroup>
<OutputPath>$(RepoRootPath)bin\$(Configuration)\tests\$(MSBuildProjectName)\</OutputPath>
<IsPackable>false</IsPackable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="xunit" Version="2.4.1" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,3 +1,7 @@
<Project>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.targets))\Directory.Build.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.targets))' != '' " />
<PropertyGroup>
<RootNamespace />
</PropertyGroup>
</Project>

Просмотреть файл

@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\DwmApi\DwmApi.csproj" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Fusion\Fusion.csproj" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Hid\Hid.csproj" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\IPHlpApi\IPHlpApi.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\DbgHelp\DbgHelp.csproj" />
<ProjectReference Include="..\..\src\ImageHlp\ImageHlp.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -4,9 +4,9 @@
<ResolveComReferenceSilent>true</ResolveComReferenceSilent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\MSCorEE\MSCorEE.csproj" />
<ProjectReference Include="..\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\Windows.Core\Windows.Core.csproj" />
<ProjectReference Include="..\..\src\MSCorEE\MSCorEE.csproj" />
<ProjectReference Include="..\..\src\Kernel32\Kernel32.csproj" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
<ItemGroup>
<COMFileReference Include="$(RepoRootPath)lib\metahost.tlb">
@ -17,7 +17,4 @@
<ItemGroup>
<EmbeddedResource Include="Keys\*.snk" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -3,9 +3,7 @@
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\DbgHelp\DbgHelp.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
<ProjectReference Include="..\..\src\Magnification\Magnification.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -3,6 +3,6 @@
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\NewDev\NewDev.csproj" />
<ProjectReference Include="..\..\src\Msi\Msi.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -3,14 +3,11 @@
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\NCrypt\NCrypt.csproj" />
<ProjectReference Include="..\..\src\NCrypt\NCrypt.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Kernel32.Tests\UseCultureAttribute.cs">
<Link>UseCultureAttribute.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\NTDll\NTDll.csproj" />
<ProjectReference Include="..\..\src\Windows.Core\Windows.Core.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

Просмотреть файл

@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\NetApi32\NetApi32.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -3,6 +3,6 @@
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\IPHlpApi\IPHlpApi.csproj" />
<ProjectReference Include="..\..\src\NewDev\NewDev.csproj" />
</ItemGroup>
</Project>

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше