You've already forked linux-packaging-mono
Imported Upstream version 5.2.0.175
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
parent
4bdbaf4a88
commit
966bba02bb
@@ -1,81 +1,50 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.23107.0
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl.Tests", "tests\System.Security.AccessControl.Tests.csproj", "{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl.Tests", "tests\System.Security.AccessControl.Tests.csproj", "{70FAC855-CAC6-4523-8477-880548D58A1B}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035} = {879C23DC-D828-4DFB-8E92-ABBC11B71035}
|
||||
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D} = {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl", "src\System.Security.AccessControl.csproj", "{879C23DC-D828-4DFB-8E92-ABBC11B71035}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl", "src\System.Security.AccessControl.csproj", "{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{F80C478C-48EE-46A5-89C4-EE0CFB23A14F} = {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.AccessControl", "ref\System.Security.AccessControl.csproj", "{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU = DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU
|
||||
ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU = ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU
|
||||
DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU
|
||||
ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU
|
||||
DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU
|
||||
ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU
|
||||
DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU
|
||||
ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU
|
||||
DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU
|
||||
ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU
|
||||
DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU
|
||||
ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = net463-Windows_NT-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = net463-Windows_NT-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = net463-Windows_NT-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnet463-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = net463-Windows_NT-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = net463-Windows_NT-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = net463-Windows_NT-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = net463-Windows_NT-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnet463-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = net463-Windows_NT-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnetstandard-Unixnetstandard-Windows_NT|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU
|
||||
{879C23DC-D828-4DFB-8E92-ABBC11B71035}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU
|
||||
{70FAC855-CAC6-4523-8477-880548D58A1B}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{70FAC855-CAC6-4523-8477-880548D58A1B}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{70FAC855-CAC6-4523-8477-880548D58A1B}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{70FAC855-CAC6-4523-8477-880548D58A1B}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
|
||||
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
|
||||
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
|
||||
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
|
||||
{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
|
||||
{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
|
||||
{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
|
||||
{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{70FAC855-CAC6-4523-8477-880548D58A1B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
|
||||
{D27FFA1F-B446-4D24-B60A-1F88385CDB6D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
|
||||
{F80C478C-48EE-46A5-89C4-EE0CFB23A14F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@@ -5,5 +5,8 @@
|
||||
<AssemblyVersion>4.1.0.0</AssemblyVersion>
|
||||
<IsNETCoreApp>true</IsNETCoreApp>
|
||||
<IsNETCoreAppRef>false</IsNETCoreAppRef>
|
||||
<IsDesktopFacade>true</IsDesktopFacade>
|
||||
<IsUAP>true</IsUAP>
|
||||
<ISUAPRef>false</ISUAPRef>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||
<ItemGroup>
|
||||
<Project Include="System.Security.AccessControl.pkgproj" />
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
|
||||
</Project>
|
||||
@@ -5,7 +5,7 @@
|
||||
<ProjectReference Include="..\ref\System.Security.AccessControl.csproj">
|
||||
<SupportedFramework>net463;netcoreapp2.0</SupportedFramework>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\src\System.Security.AccessControl.builds" />
|
||||
<ProjectReference Include="..\src\System.Security.AccessControl.csproj" />
|
||||
<NotSupportedOnTargetFramework Include="netcore50">
|
||||
<PackageTargetRuntime>win</PackageTargetRuntime>
|
||||
</NotSupportedOnTargetFramework>
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
|
||||
<ItemGroup>
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<BuildConfigurations>
|
||||
net463-Windows_NT;
|
||||
netfx-Windows_NT;
|
||||
netcoreapp-Windows_NT;
|
||||
netcoreapp-Unix;
|
||||
uap-Windows_NT;
|
||||
</BuildConfigurations>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -0,0 +1,4 @@
|
||||
advapi32.dll!OpenProcessToken
|
||||
advapi32.dll!OpenThreadToken
|
||||
advapi32.dll!RevertToSelf
|
||||
advapi32.dll!SetThreadToken
|
||||
@@ -1,64 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
@@ -240,6 +181,9 @@
|
||||
<data name="InvalidOperation_OnlyValidForDS" xml:space="preserve">
|
||||
<value>Adding ACEs with Object Flags and Object GUIDs is only valid for directory-object ACLs.</value>
|
||||
</data>
|
||||
<data name="InvalidOperation_DisconnectedPipe" xml:space="preserve">
|
||||
<value>The pipe has been disconnected.</value>
|
||||
</data>
|
||||
<data name="NotSupported_SetMethod" xml:space="preserve">
|
||||
<value>The 'set' method is not supported on this property.</value>
|
||||
</data>
|
||||
|
||||
@@ -1,23 +1,26 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||
<PropertyGroup>
|
||||
<AssemblyName>System.Security.AccessControl</AssemblyName>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly>
|
||||
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx'">true</IsPartialFacadeAssembly>
|
||||
<GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly>
|
||||
<ProjectGuid>{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<!-- Help VS understand available configurations -->
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Release|AnyCPU'" />
|
||||
<ItemGroup Condition="'$(TargetGroup)'=='net463'">
|
||||
<TargetingPackReference Include="mscorlib" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
|
||||
<ItemGroup Condition="'$(TargetGroup)'=='netfx'">
|
||||
<Reference Include="mscorlib" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetGroup)'=='netcoreapp' AND '$(TargetsWindows)'=='true'">
|
||||
<ItemGroup Condition="('$(TargetGroup)'=='netcoreapp' OR '$(TargetGroup)'=='uap') AND '$(TargetsWindows)'=='true'">
|
||||
<Compile Include="System\Security\AccessControl\ACE.cs" />
|
||||
<Compile Include="System\Security\AccessControl\ACL.cs" />
|
||||
<Compile Include="System\Security\AccessControl\CommonObjectSecurity.cs" />
|
||||
@@ -128,4 +131,4 @@
|
||||
<Reference Include="System.Threading.Thread" />
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
|
||||
</Project>
|
||||
</Project>
|
||||
@@ -149,7 +149,7 @@ nameof(binaryForm),
|
||||
|
||||
binaryForm[offset + 0] = (byte)AceType;
|
||||
binaryForm[offset + 1] = (byte)AceFlags;
|
||||
binaryForm[offset + 2] = (byte)(Length >> 0);
|
||||
binaryForm[offset + 2] = unchecked((byte)(Length >> 0));
|
||||
binaryForm[offset + 3] = (byte)(Length >> 8);
|
||||
}
|
||||
|
||||
@@ -987,11 +987,11 @@ nameof(opaque),
|
||||
//
|
||||
|
||||
accessMask =
|
||||
(int)(
|
||||
unchecked((int)(
|
||||
(((uint)binaryForm[baseOffset + 0]) << 0) +
|
||||
(((uint)binaryForm[baseOffset + 1]) << 8) +
|
||||
(((uint)binaryForm[baseOffset + 2]) << 16) +
|
||||
(((uint)binaryForm[baseOffset + 3]) << 24));
|
||||
(((uint)binaryForm[baseOffset + 3]) << 24)));
|
||||
|
||||
offsetLocal += AccessMaskLength;
|
||||
|
||||
@@ -1067,11 +1067,13 @@ nameof(opaque),
|
||||
//
|
||||
// Store the access mask in the big-endian format
|
||||
//
|
||||
|
||||
binaryForm[baseOffset + 0] = (byte)(AccessMask >> 0);
|
||||
binaryForm[baseOffset + 1] = (byte)(AccessMask >> 8);
|
||||
binaryForm[baseOffset + 2] = (byte)(AccessMask >> 16);
|
||||
binaryForm[baseOffset + 3] = (byte)(AccessMask >> 24);
|
||||
unchecked
|
||||
{
|
||||
binaryForm[baseOffset + 0] = (byte)(AccessMask >> 0);
|
||||
binaryForm[baseOffset + 1] = (byte)(AccessMask >> 8);
|
||||
binaryForm[baseOffset + 2] = (byte)(AccessMask >> 16);
|
||||
binaryForm[baseOffset + 3] = (byte)(AccessMask >> 24);
|
||||
}
|
||||
|
||||
offsetLocal += AccessMaskLength;
|
||||
|
||||
@@ -1623,10 +1625,13 @@ nameof(qualifier),
|
||||
// Store the access mask in the big-endian format
|
||||
//
|
||||
|
||||
binaryForm[baseOffset + 0] = (byte)(AccessMask >> 0);
|
||||
binaryForm[baseOffset + 1] = (byte)(AccessMask >> 8);
|
||||
binaryForm[baseOffset + 2] = (byte)(AccessMask >> 16);
|
||||
binaryForm[baseOffset + 3] = (byte)(AccessMask >> 24);
|
||||
unchecked
|
||||
{
|
||||
binaryForm[baseOffset + 0] = (byte)(AccessMask >> 0);
|
||||
binaryForm[baseOffset + 1] = (byte)(AccessMask >> 8);
|
||||
binaryForm[baseOffset + 2] = (byte)(AccessMask >> 16);
|
||||
binaryForm[baseOffset + 3] = (byte)(AccessMask >> 24);
|
||||
}
|
||||
|
||||
offsetLocal += AccessMaskLength;
|
||||
|
||||
@@ -1950,11 +1955,11 @@ nameof(qualifier),
|
||||
int offsetLocal = 0;
|
||||
|
||||
accessMask =
|
||||
(int)(
|
||||
unchecked((int)(
|
||||
(((uint)binaryForm[baseOffset + 0]) << 0) +
|
||||
(((uint)binaryForm[baseOffset + 1]) << 8) +
|
||||
(((uint)binaryForm[baseOffset + 2]) << 16) +
|
||||
(((uint)binaryForm[baseOffset + 3]) << 24));
|
||||
(((uint)binaryForm[baseOffset + 3]) << 24)));
|
||||
|
||||
offsetLocal += AccessMaskLength;
|
||||
|
||||
@@ -2159,11 +2164,13 @@ nameof(qualifier),
|
||||
//
|
||||
// Store the access mask in the big-endian format
|
||||
//
|
||||
|
||||
binaryForm[baseOffset + 0] = (byte)(AccessMask >> 0);
|
||||
binaryForm[baseOffset + 1] = (byte)(AccessMask >> 8);
|
||||
binaryForm[baseOffset + 2] = (byte)(AccessMask >> 16);
|
||||
binaryForm[baseOffset + 3] = (byte)(AccessMask >> 24);
|
||||
unchecked
|
||||
{
|
||||
binaryForm[baseOffset + 0] = (byte)(AccessMask >> 0);
|
||||
binaryForm[baseOffset + 1] = (byte)(AccessMask >> 8);
|
||||
binaryForm[baseOffset + 2] = (byte)(AccessMask >> 16);
|
||||
binaryForm[baseOffset + 3] = (byte)(AccessMask >> 24);
|
||||
}
|
||||
|
||||
offsetLocal += AccessMaskLength;
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
2e06ae2e9741f264b2c72ea5a726997046dfe89a
|
||||
8ef5bb63b88c7c40c11af099df58bad53b2b5125
|
||||
@@ -152,6 +152,10 @@ nameof(name));
|
||||
{
|
||||
exception = new NotSupportedException(SR.AccessControl_NoAssociatedSecurity);
|
||||
}
|
||||
else if (error == Interop.Errors.ERROR_PIPE_NOT_CONNECTED)
|
||||
{
|
||||
exception = new InvalidOperationException(SR.InvalidOperation_DisconnectedPipe);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Assert(false, string.Format(CultureInfo.InvariantCulture, "Win32GetSecurityInfo() failed with unexpected error code {0}", error));
|
||||
@@ -234,7 +238,7 @@ nameof(name));
|
||||
|
||||
if ((_securityDescriptor.ControlFlags & ControlFlags.DiscretionaryAclProtected) != 0)
|
||||
{
|
||||
securityInfo = (SecurityInfos)((uint)securityInfo | ProtectedDiscretionaryAcl);
|
||||
securityInfo = unchecked((SecurityInfos)((uint)securityInfo | ProtectedDiscretionaryAcl));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -302,9 +302,6 @@ namespace System.Security.AccessControl
|
||||
|
||||
// Use this in your own Persist after you have demanded any appropriate CAS permissions.
|
||||
// Note that you will want your version to be internal and use a specialized Safe Handle.
|
||||
// <SecurityKernel Critical="True" Ring="0">
|
||||
// <Asserts Name="Declarative: [SecurityPermission(SecurityAction.Assert, UnmanagedCode = true)]" />
|
||||
// </SecurityKernel>
|
||||
protected internal void Persist(SafeHandle handle)
|
||||
{
|
||||
WriteLock();
|
||||
|
||||
@@ -305,7 +305,7 @@ nameof(binaryForm),
|
||||
|
||||
binaryForm[offset + 0] = Revision;
|
||||
binaryForm[offset + 1] = rmControl;
|
||||
binaryForm[offset + 2] = (byte)((int)materializedControlFlags >> 0);
|
||||
binaryForm[offset + 2] = unchecked((byte)((int)materializedControlFlags >> 0));
|
||||
binaryForm[offset + 3] = (byte)((int)materializedControlFlags >> 8);
|
||||
|
||||
//
|
||||
|
||||
@@ -282,7 +282,7 @@ nameof(handle));
|
||||
|
||||
if (name != null)
|
||||
{
|
||||
errorCode = (int)Interop.Advapi32.SetSecurityInfoByName(name, (uint)type, (uint)securityInformation, OwnerBinary, GroupBinary, DaclBinary, SaclBinary);
|
||||
errorCode = (int)Interop.Advapi32.SetSecurityInfoByName(name, (uint)type, unchecked((uint)securityInformation), OwnerBinary, GroupBinary, DaclBinary, SaclBinary);
|
||||
}
|
||||
else if (handle != null)
|
||||
{
|
||||
|
||||
@@ -36,10 +36,13 @@ namespace System.Security.AccessControl.Tests
|
||||
int baseOffset = offset + 4;
|
||||
int offsetLocal = 0;
|
||||
|
||||
binaryForm[baseOffset + 0] = (byte)(accessMask >> 0);
|
||||
binaryForm[baseOffset + 1] = (byte)(accessMask >> 8);
|
||||
binaryForm[baseOffset + 2] = (byte)(accessMask >> 16);
|
||||
binaryForm[baseOffset + 3] = (byte)(accessMask >> 24);
|
||||
unchecked
|
||||
{
|
||||
binaryForm[baseOffset + 0] = (byte)(accessMask >> 0);
|
||||
binaryForm[baseOffset + 1] = (byte)(accessMask >> 8);
|
||||
binaryForm[baseOffset + 2] = (byte)(accessMask >> 16);
|
||||
binaryForm[baseOffset + 3] = (byte)(accessMask >> 24);
|
||||
}
|
||||
offsetLocal += 4;
|
||||
|
||||
binaryForm[baseOffset + offsetLocal + 0] = (byte)((ushort)compoundAceType >> 0);
|
||||
|
||||
@@ -61,10 +61,13 @@ namespace System.Security.AccessControl.Tests
|
||||
int baseOffset = offset + 4;
|
||||
int offsetLocal = 0;
|
||||
|
||||
binaryForm[baseOffset + 0] = (byte)(accessMask >> 0);
|
||||
binaryForm[baseOffset + 1] = (byte)(accessMask >> 8);
|
||||
binaryForm[baseOffset + 2] = (byte)(accessMask >> 16);
|
||||
binaryForm[baseOffset + 3] = (byte)(accessMask >> 24);
|
||||
unchecked
|
||||
{
|
||||
binaryForm[baseOffset + 0] = (byte)(accessMask >> 0);
|
||||
binaryForm[baseOffset + 1] = (byte)(accessMask >> 8);
|
||||
binaryForm[baseOffset + 2] = (byte)(accessMask >> 16);
|
||||
binaryForm[baseOffset + 3] = (byte)(accessMask >> 24);
|
||||
}
|
||||
offsetLocal += 4;
|
||||
|
||||
binaryForm[baseOffset + offsetLocal + 0] = (byte)(((uint)flags) >> 0);
|
||||
|
||||
@@ -83,7 +83,7 @@ namespace System.Security.AccessControl.Tests
|
||||
|
||||
[Theory]
|
||||
[MemberData(nameof(CommonSecurityDescriptor_CreateFromSddlForm_TestData))]
|
||||
private static void TestCreateFromSddlForm(bool isContainer, bool isDS, string sddl, string verifierSddl)
|
||||
public static void TestCreateFromSddlForm(bool isContainer, bool isDS, string sddl, string verifierSddl)
|
||||
{
|
||||
CommonSecurityDescriptor commonSecurityDescriptor = null;
|
||||
commonSecurityDescriptor = new CommonSecurityDescriptor(isContainer, isDS, sddl);
|
||||
|
||||
@@ -84,6 +84,7 @@ namespace System.Security.AccessControl.Tests
|
||||
|
||||
[Theory]
|
||||
[MemberData(nameof(CommonSecurityDescriptor_GetBinaryForm_TestData))]
|
||||
[ActiveIssue(16919)]
|
||||
public static void TestGetBinaryForm(bool isContainer, bool isDS, string sddl, string verifierSddl, int offset)
|
||||
{
|
||||
CommonSecurityDescriptor commonSecurityDescriptor = null;
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace System.Security.AccessControl.Tests
|
||||
{
|
||||
public static IEnumerable<object[]> CommonSecurityDescriptor_GetSddlForm_TestData()
|
||||
{
|
||||
yield return new object[] { true, false, 20, "BA", "BG", "64:2:4096:BA:false:0", "0:1:4096:BO:false:0", false, false, false, false , null};
|
||||
yield return new object[] { true, false, 20, "BA", "BG", "64:2:4096:BA:false:0", "0:1:4096:BO:false:0", false, false, false, false , "" };
|
||||
yield return new object[] { true, false, 20, "BA", "BG", "64:2:4096:BA:false:0", "0:1:4096:BO:false:0", false, false, false, true , "D:(D;;0x1000;;;BO)" };
|
||||
yield return new object[] { true, false, 20, "BA", "BG", "64:2:4096:BA:false:0", "0:1:4096:BO:false:0", false, false, true , false, "S:(AU;SA;0x1000;;;BA)" };
|
||||
yield return new object[] { true, false, 20, "BA", "BG", "64:2:4096:BA:false:0", "0:1:4096:BO:false:0", false, false, true , true , "D:(D;;0x1000;;;BO)S:(AU;SA;0x1000;;;BA)" };
|
||||
@@ -29,7 +29,7 @@ namespace System.Security.AccessControl.Tests
|
||||
yield return new object[] { true, false, 20, "BA", "BG", "64:2:4096:BA:false:0", "0:1:4096:BO:false:0", true , true , false, true , "O:BAG:BGD:(D;;0x1000;;;BO)" };
|
||||
yield return new object[] { true, false, 20, "BA", "BG", "64:2:4096:BA:false:0", "0:1:4096:BO:false:0", true , true , true , false, "O:BAG:BGS:(AU;SA;0x1000;;;BA)" };
|
||||
yield return new object[] { true, false, 20, "BA", "BG", "64:2:4096:BA:false:0", "0:1:4096:BO:false:0", true , true , true , true , "O:BAG:BGD:(D;;0x1000;;;BO)S:(AU;SA;0x1000;;;BA)" };
|
||||
yield return new object[] { true, false, 0 , null, null, null , null , true , true , true , true , null};
|
||||
yield return new object[] { true, false, 0 , null, null, null , null , true , true , true , true , "" };
|
||||
yield return new object[] { true, false, 4 , "BA", "BG", "64:2:4096:BA:false:0", "0:1:4096:BO:false:0", true , true , true , true , "O:BAG:BGD:(D;;0x1000;;;BO)S:(AU;SA;0x1000;;;BA)" };
|
||||
yield return new object[] { true, false, 4 , "BA", "BG", null , "0:1:4096:BO:false:0", true , true , true , true , "O:BAG:BGD:(D;;0x1000;;;BO)" };
|
||||
yield return new object[] { true, false, 20, "BA", "BG", null , "0:1:4096:BO:false:0", true , true , true , true , "O:BAG:BGD:(D;;0x1000;;;BO)" };
|
||||
@@ -82,10 +82,7 @@ namespace System.Security.AccessControl.Tests
|
||||
accControlSections |= AccessControlSections.Access;
|
||||
|
||||
resultSddl = commonSecurityDescriptor.GetSddlForm(accControlSections);
|
||||
if (expectedSddl == null || resultSddl == null)
|
||||
Assert.True(expectedSddl == null && resultSddl == null);
|
||||
else
|
||||
Assert.True(String.Compare(expectedSddl, resultSddl, StringComparison.CurrentCultureIgnoreCase) == 0);
|
||||
Assert.True(string.Compare(expectedSddl, resultSddl, StringComparison.CurrentCultureIgnoreCase) == 0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user