diff options
42 files changed, 285 insertions, 39 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index b6fbc40c92..6433606662 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -2.0.0-prerelease-01609-03 +2.0.0-prerelease-01610-01 diff --git a/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj index 9dec4f1785..4a26c70133 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj @@ -5,7 +5,7 @@ <AssemblyName>Microsoft.Win32.Registry.AccessControl</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'netfx'">None</ResourcesSourceOutputDirectory> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_RegistryAccessControl</GeneratePlatformNotSupportedAssemblyMessage> <ProjectGuid>{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}</ProjectGuid> </PropertyGroup> <!-- Help VS understand available configurations --> @@ -22,6 +22,9 @@ <Reference Include="Microsoft.Win32.Registry" /> <Reference Include="System.Security.AccessControl" /> </ItemGroup> + <ItemGroup Condition="'$(TargetsWindows)' != 'true'"> + <Reference Include="System.Resources.ResourceManager" /> + </ItemGroup> <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> <Compile Include="Microsoft\Win32\RegistryAclExtensions.cs" /> </ItemGroup> diff --git a/src/Microsoft.Win32.Registry.AccessControl/src/Resources/Strings.resx b/src/Microsoft.Win32.Registry.AccessControl/src/Resources/Strings.resx new file mode 100644 index 0000000000..fdd06141be --- /dev/null +++ b/src/Microsoft.Win32.Registry.AccessControl/src/Resources/Strings.resx @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <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"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <data name="PlatformNotSupported_RegistryAccessControl" xml:space="preserve"> + <value>Access Control List (ACL) APIs are specific to the way in which Windows manages access to resources, and are not supported on this platform.</value> + </data> +</root>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index ffb2f8ad85..4e390fd1cf 100644 --- a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -8,7 +8,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)' == 'netstandard'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_Registry</GeneratePlatformNotSupportedAssemblyMessage> <!-- Temporarily necessary as this is only being built for UWP due to an unwanted dependency on it https://github.com/dotnet/corefx/issues/15966 diff --git a/src/System.Data.SqlClient/src/Resources/Strings.resx b/src/System.Data.SqlClient/src/Resources/Strings.resx index 3ea072526e..02ed1ac250 100644 --- a/src/System.Data.SqlClient/src/Resources/Strings.resx +++ b/src/System.Data.SqlClient/src/Resources/Strings.resx @@ -1042,4 +1042,7 @@ <data name="LocalDBNotSupported" xml:space="preserve"> <value>LocalDB is not supported on this Platform.</value> </data> + <data name="PlatformNotSupported_DataSqlClient" xml:space="preserve"> + <value>System.Data.SqlClient is not supported on this platform.</value> + </data> </root> diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index ab44d8ce48..193dfd7847 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj @@ -8,7 +8,7 @@ <!-- Although we have a NS configuration, we know we use API that's not currently whitelisted: just validate against OneCore --> <UWPCompatible>false</UWPCompatible> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> - <GeneratePlatformNotSupportedAssembly Condition="'$(OSGroup)' == 'AnyOS'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS'">SR.PlatformNotSupported_DataSqlClient</GeneratePlatformNotSupportedAssemblyMessage> <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.2'">4.0.0.0</AssemblyVersion> <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.3'">4.1.0.0</AssemblyVersion> </PropertyGroup> @@ -27,7 +27,7 @@ <ItemGroup Condition="'$(TargetGroup)' == 'netstandard'"> <Compile Include="System.Data.SqlClient.TypeForwards.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS'"> <Compile Include="Microsoft\SqlServer\Server\ITypedGetters.cs" /> <Compile Include="Microsoft\SqlServer\Server\ITypedGettersV3.cs" /> <Compile Include="Microsoft\SqlServer\Server\ITypedSetters.cs" /> @@ -286,7 +286,7 @@ </Compile> </ItemGroup> <!-- Common (Windows and Unix) dependencies for MANAGED_SNI build --> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS'"> <Compile Include="$(CommonPath)\System\Net\ContextFlagsPal.cs"> <Link>Common\System\Net\ContextFlagsPal.cs</Link> </Compile> @@ -318,7 +318,7 @@ <Link>Common\System\Net\NegotiationInfoClass.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' != 'true' And '$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition=" '$(TargetsWindows)' != 'true' And '$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS'"> <Compile Include="System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" /> <Compile Include="Interop\SNINativeMethodWrapper.Unix.cs" /> <Compile Include="$(CommonPath)\System\Net\Security\NegotiateStreamPal.Unix.cs"> @@ -371,7 +371,7 @@ <Reference Include="System.Threading.Tasks" /> <Reference Include="System.Xml.ReaderWriter" /> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true' "> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS'"> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> diff --git a/src/System.IO.FileSystem.AccessControl/src/Resources/Strings.resx b/src/System.IO.FileSystem.AccessControl/src/Resources/Strings.resx index 6c07ecef27..6a9497fc2c 100644 --- a/src/System.IO.FileSystem.AccessControl/src/Resources/Strings.resx +++ b/src/System.IO.FileSystem.AccessControl/src/Resources/Strings.resx @@ -82,4 +82,7 @@ <data name="ObjectDisposed_FileClosed" xml:space="preserve"> <value>Cannot access a closed file.</value> </data> + <data name="PlatformNotSupported_AccessControl" xml:space="preserve"> + <value>Access Control List (ACL) APIs are part of resource management on Windows and are not supported on this platform.</value> + </data> </root>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 8164b25259..2482240f5e 100644 --- a/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -9,7 +9,7 @@ <ProjectGuid>{D77FBA6C-1AA6-45A4-93E2-97A370672C53}</ProjectGuid> <AllowUnsafeBlocks Condition="'$(TargetGroup)'=='netcoreapp'">true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx'">true</IsPartialFacadeAssembly> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true' OR '$(TargetGroup)' == 'netstandard'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsUnix)' == 'true' OR '$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> diff --git a/src/System.IO.Pipes.AccessControl/src/Resources/Strings.resx b/src/System.IO.Pipes.AccessControl/src/Resources/Strings.resx index 85da74cf7e..04332682f3 100644 --- a/src/System.IO.Pipes.AccessControl/src/Resources/Strings.resx +++ b/src/System.IO.Pipes.AccessControl/src/Resources/Strings.resx @@ -70,4 +70,7 @@ <data name="IO_IO_PipeBroken" xml:space="preserve"> <value>Pipe is broken.</value> </data> + <data name="PlatformNotSupported_AccessControl" xml:space="preserve"> + <value>Access Control List (ACL) APIs are part of resource management on Windows and are not supported on this platform.</value> + </data> </root> diff --git a/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj index 5d1b3c26c4..15b3bcf8c4 100644 --- a/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj +++ b/src/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj @@ -5,7 +5,7 @@ <AssemblyName>System.IO.Pipes.AccessControl</AssemblyName> <ProjectGuid>{40059634-BB03-4A6F-8657-CCE2D376BC8B}</ProjectGuid> <AllowUnsafeBlocks Condition="'$(TargetGroup)'=='netstandard'">true</AllowUnsafeBlocks> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <!-- Default configurations to help VS understand the options --> diff --git a/src/System.IO.Ports/src/Resources/Strings.resx b/src/System.IO.Ports/src/Resources/Strings.resx index f8c82f45ba..7266dcdc3a 100644 --- a/src/System.IO.Ports/src/Resources/Strings.resx +++ b/src/System.IO.Ports/src/Resources/Strings.resx @@ -169,4 +169,7 @@ <data name="UnauthorizedAccess_IODenied_Path" xml:space="preserve"> <value>Access to the port '{0}' is denied.</value> </data> + <data name="PlatformNotSupported_IOPorts" xml:space="preserve"> + <value>System.IO.Ports is currently only supported on Windows.</value> + </data> </root> diff --git a/src/System.IO.Ports/src/System.IO.Ports.csproj b/src/System.IO.Ports/src/System.IO.Ports.csproj index be46718ac8..bb447afad6 100644 --- a/src/System.IO.Ports/src/System.IO.Ports.csproj +++ b/src/System.IO.Ports/src/System.IO.Ports.csproj @@ -5,7 +5,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ProjectGuid>{187503F4-BEF9-4369-A1B2-E3DC5D564E4E}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_IOPorts</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" /> diff --git a/src/System.Net.Http.WinHttpHandler/src/Resources/Strings.resx b/src/System.Net.Http.WinHttpHandler/src/Resources/Strings.resx index 35cc2a6dbd..846190e58d 100644 --- a/src/System.Net.Http.WinHttpHandler/src/Resources/Strings.resx +++ b/src/System.Net.Http.WinHttpHandler/src/Resources/Strings.resx @@ -121,4 +121,7 @@ <data name="net_http_content_stream_already_read" xml:space="preserve"> <value>The stream was already consumed. It cannot be read again.</value> </data> + <data name="PlatformNotSupported_WinHttpHandler" xml:space="preserve"> + <value>WinHttpHandler is only supported on .NET Framework and .NET Core runtimes on Windows. It is not supported for Windows Store Applications (UWP) or Unix platforms.</value> + </data> </root> diff --git a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index d88f01c6bf..b1df65fc39 100644 --- a/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/src/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -6,7 +6,7 @@ <ProjectGuid>{F75E3008-0562-42DF-BE72-C1384F12157E}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>System.Net.Http.WinHttpHandler</AssemblyName> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_WinHttpHandler</GeneratePlatformNotSupportedAssemblyMessage> <!-- Although we have a NS configuration, the actual UWP implementation is a shim over WinRT: so just validate against OneCore --> <UWPCompatible>false</UWPCompatible> </PropertyGroup> diff --git a/src/System.Reflection.Context/src/Resources/Strings.resx b/src/System.Reflection.Context/src/Resources/Strings.resx new file mode 100644 index 0000000000..0ff46e5053 --- /dev/null +++ b/src/System.Reflection.Context/src/Resources/Strings.resx @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <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"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <data name="PlatformNotSupported_ReflectionContext" xml:space="preserve"> + <value>Customized reflection contexts are only supported on .NET Framework.</value> + </data> +</root>
\ No newline at end of file diff --git a/src/System.Reflection.Context/src/System.Reflection.Context.csproj b/src/System.Reflection.Context/src/System.Reflection.Context.csproj index 2cdf93bed0..b7e0867b00 100644 --- a/src/System.Reflection.Context/src/System.Reflection.Context.csproj +++ b/src/System.Reflection.Context/src/System.Reflection.Context.csproj @@ -5,7 +5,7 @@ <OutputType>Library</OutputType> <ProjectGuid>{404DB891-B5AF-41E6-B89D-29E3F4573C4F}</ProjectGuid> <!-- only supported by desktop CLR --> - <GeneratePlatformNotSupportedAssembly>true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_ReflectionContext</GeneratePlatformNotSupportedAssemblyMessage> <!-- Xamarin frameworks claim to support PCL profiles which include this assembly, but do not include this assembly in their framework. This causes NuGet to give them the placeholder from the portable-* folder. @@ -19,6 +19,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.1-Release|AnyCPU'" /> <ItemGroup> <Reference Include="System.Reflection" /> + <Reference Include="System.Resources.ResourceManager" /> <Reference Include="System.Runtime" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/System.Reflection.DispatchProxy/src/Resources/Strings.resx b/src/System.Reflection.DispatchProxy/src/Resources/Strings.resx index 3aa4787a94..6817eaa469 100644 --- a/src/System.Reflection.DispatchProxy/src/Resources/Strings.resx +++ b/src/System.Reflection.DispatchProxy/src/Resources/Strings.resx @@ -70,4 +70,7 @@ <data name="BaseType_Cannot_Be_Abstract" xml:space="preserve"> <value>The base type '{0}' cannot be abstract.</value> </data> + <data name="PlatformNotSupported_ReflectionDispatchProxy" xml:space="preserve"> + <value>This operation is not supported on .NET Standard as Reflection.Emit is not available.</value> + </data> </root>
\ No newline at end of file diff --git a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj b/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj index 1ac745d67b..22b679e453 100644 --- a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj +++ b/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj @@ -7,7 +7,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'uapaot'">true</IsPartialFacadeAssembly> <!-- this library depends on Ref.Emit which is not available for netstandard --> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)' == 'netstandard'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_ReflectionDispatchProxy</GeneratePlatformNotSupportedAssemblyMessage> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'uapaot'">None</ResourcesSourceOutputDirectory> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> @@ -20,7 +20,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Release|AnyCPU'" /> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(TargetGroup)' != 'netstandard'"> <Compile Include="System\Reflection\DispatchProxy.cs" /> <Compile Include="System\Reflection\DispatchProxyGenerator.cs" /> </ItemGroup> @@ -33,7 +33,7 @@ <ReferenceFromRuntime Include="System.Private.Interop" /> <ReferenceFromRuntime Include="System.Private.CoreLib" /> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true' AND '$(TargetGroup)' != 'netfx'"> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(TargetGroup)' != 'netstandard' AND '$(TargetGroup)' != 'netfx'"> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Linq" /> diff --git a/src/System.Reflection.TypeExtensions/src/Resources/Strings.resx b/src/System.Reflection.TypeExtensions/src/Resources/Strings.resx index 02cffb4fff..775ec06d45 100644 --- a/src/System.Reflection.TypeExtensions/src/Resources/Strings.resx +++ b/src/System.Reflection.TypeExtensions/src/Resources/Strings.resx @@ -61,4 +61,7 @@ <data name="NoMetadataTokenAvailable" xml:space="preserve"> <value>There is no metadata token available for the given member.</value> </data> + <data name="PlatformNotSupported_ReflectionTypeExtensions" xml:space="preserve"> + <value>System.Reflection.TypeExtensions is not supported on NET Standard 1.3 or 1.5.</value> + </data> </root>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj index 1274e7b22e..960fdd5e3e 100644 --- a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj +++ b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj @@ -7,8 +7,7 @@ <ProjectGuid>{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}</ProjectGuid> </PropertyGroup> <PropertyGroup Condition="'$(TargetGroup)' == 'netstandard1.3' OR '$(TargetGroup)' == 'netstandard1.5'"> - <GeneratePlatformNotSupportedAssembly>true</GeneratePlatformNotSupportedAssembly> - <OmitResources>true</OmitResources> + <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_ReflectionTypeExtensions</GeneratePlatformNotSupportedAssemblyMessage> <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.3'">4.0.0.0</AssemblyVersion> <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.5'">4.1.0.0</AssemblyVersion> </PropertyGroup> @@ -29,7 +28,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Release|AnyCPU'" /> - <ItemGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(TargetGroup)' != 'netstandard1.3' AND '$(TargetGroup)' != 'netstandard1.5'"> <Compile Include="System\Reflection\Requires.cs" /> <Compile Include="System\Reflection\TypeExtensions.cs" /> </ItemGroup> diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx b/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx index 3efe7cf192..5d87c90339 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx +++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx @@ -61,4 +61,7 @@ <data name="Argument_EmptyValue" xml:space="preserve"> <value>Value cannot be empty.</value> </data> + <data name="PlatformNotSupported_RuntimeInformation" xml:space="preserve"> + <value>RuntimeInformation is not supported for Portable Class Libraries.</value> + </data> </root>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj index 47f3c15e5f..1774533f7a 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj +++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj @@ -10,7 +10,7 @@ <DefineConstants Condition="'$(TargetGroup)'=='wpa81'">$(DefineConstants);wpa81</DefineConstants> <DefineConstants Condition="'$(TargetGroup)'=='win8'">$(DefineConstants);win8</DefineConstants> <DefineConstants Condition="'$(TargetGroup)'=='uap'">$(DefineConstants);uap</DefineConstants> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)'=='netstandard1.1' AND '$(OSGroup)'=='AnyOS'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)'=='netstandard1.1' AND '$(OSGroup)'=='AnyOS'">SR.PlatformNotSupported_RuntimeInformation</GeneratePlatformNotSupportedAssemblyMessage> <!-- use netstandard1.1 refs for win8 and wpa81 --> <RefPath Condition="'$(TargetGroup)'=='wpa81' OR '$(TargetGroup)'=='win8'">$(RefRootPath)/netstandard1.1</RefPath> <!-- For net45 use the netstandard1.1 contract for APICompat --> @@ -100,7 +100,7 @@ <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Threading" /> </ItemGroup> - <ItemGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(TargetGroup)'!='netstandard1.1' OR '$(OSGroup)'!='AnyOS'"> <Compile Include="System\Runtime\InteropServices\RuntimeInformation\RuntimeInformation.cs" /> <Compile Include="System\Runtime\InteropServices\RuntimeInformation\Architecture.cs" /> <Compile Include="System\Runtime\InteropServices\RuntimeInformation\OSPlatform.cs" /> diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/Resources/Strings.resx b/src/System.Runtime.InteropServices.WindowsRuntime/src/Resources/Strings.resx new file mode 100644 index 0000000000..1e8912fc3f --- /dev/null +++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/Resources/Strings.resx @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <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"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <data name="PlatformNotSupported_WindowsRuntime" xml:space="preserve"> + <value>Operations with Windows Runtime are only supported on Windows platforms.</value> + </data> +</root>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj index a620e7f8dd..4e5cd0ec37 100644 --- a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj +++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj @@ -18,10 +18,11 @@ <ItemGroup> <ReferenceFromRuntime Include="System.Private.Interop" Condition="'$(TargetGroup)' == 'uapaot'" /> <ReferenceFromRuntime Include="System.Private.CoreLib" Condition="'$(TargetsWindows)'=='true'" /> + <Reference Include="System.Resources.ResourceManager" Condition="'$(TargetsWindows)'!='true'" /> <Reference Include="System.Runtime" Condition="'$(TargetsWindows)'!='true'" /> </ItemGroup> <PropertyGroup Condition="'$(TargetsWindows)'!='true'"> - <GeneratePlatformNotSupportedAssembly>true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_WindowsRuntime</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Security.AccessControl/src/Resources/Strings.resx b/src/System.Security.AccessControl/src/Resources/Strings.resx index 6892c4fe1b..8c858679e7 100644 --- a/src/System.Security.AccessControl/src/Resources/Strings.resx +++ b/src/System.Security.AccessControl/src/Resources/Strings.resx @@ -196,4 +196,7 @@ <data name="Rank_MultiDimNotSupported" xml:space="preserve"> <value>Only single dimension arrays are supported here.</value> </data> + <data name="PlatformNotSupported_AccessControl" xml:space="preserve"> + <value>Access Control List (ACL) APIs are part of resource management on Windows and are not supported on this platform.</value> + </data> </root>
\ No newline at end of file diff --git a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj index 31e03df477..93313cf651 100644 --- a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -5,7 +5,7 @@ <AssemblyName>System.Security.AccessControl</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx'">true</IsPartialFacadeAssembly> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage> <ProjectGuid>{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}</ProjectGuid> </PropertyGroup> <!-- Help VS understand available configurations --> diff --git a/src/System.Security.Cryptography.Cng/src/Resources/Strings.resx b/src/System.Security.Cryptography.Cng/src/Resources/Strings.resx index 4a68c0e034..b5c42a56c5 100644 --- a/src/System.Security.Cryptography.Cng/src/Resources/Strings.resx +++ b/src/System.Security.Cryptography.Cng/src/Resources/Strings.resx @@ -181,4 +181,7 @@ <data name="Cryptography_WeakKey" xml:space="preserve"> <value>Specified key is a known weak key for this algorithm and cannot be used.</value> </data> + <data name="PlatformNotSupported_CryptographyCng" xml:space="preserve"> + <value>Windows Cryptography Next Generation (CNG) is not supported on this platform.</value> + </data> </root> diff --git a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj index 366ed5500f..bcb71fae68 100644 --- a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj +++ b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj @@ -12,8 +12,7 @@ <DefineConstants Condition="'$(TargetGroup)' == 'uap'">$(DefineConstants);uap</DefineConstants> </PropertyGroup> <PropertyGroup Condition="'$(TargetGroup)' == 'netstandard1.3' OR '$(TargetGroup)' == 'netstandard1.4' OR '$(TargetGroup)' == 'netstandard'"> - <GeneratePlatformNotSupportedAssembly>true</GeneratePlatformNotSupportedAssembly> - <OmitResources>true</OmitResources> + <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_CryptographyCng</GeneratePlatformNotSupportedAssemblyMessage> <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.3'">4.0.0.0</AssemblyVersion> <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.4'">4.1.0.0</AssemblyVersion> </PropertyGroup> diff --git a/src/System.Security.Cryptography.OpenSsl/src/Resources/Strings.resx b/src/System.Security.Cryptography.OpenSsl/src/Resources/Strings.resx index 032549c48e..477deffaf4 100644 --- a/src/System.Security.Cryptography.OpenSsl/src/Resources/Strings.resx +++ b/src/System.Security.Cryptography.OpenSsl/src/Resources/Strings.resx @@ -174,4 +174,7 @@ <data name="Cryptography_Invalid_IA5String" xml:space="preserve"> <value>The string contains a character not in the 7 bit ASCII character set.</value> </data> + <data name="PlatformNotSupported_CryptographyOpenSSL" xml:space="preserve"> + <value>OpenSSL is not supported on this platform.</value> + </data> </root> diff --git a/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj index 5d83881087..fcd0bd6a39 100644 --- a/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj +++ b/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj @@ -8,7 +8,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <PropertyGroup Condition="'$(TargetGroup)' == 'netstandard'"> - <GeneratePlatformNotSupportedAssembly>true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_CryptographyOpenSSL</GeneratePlatformNotSupportedAssemblyMessage> <!-- Clear PackageTargetRuntime on Windows to package the PlatformNotSupported assembly without a RID so that it applies in desktop packages.config projects as well --> <PackageTargetRuntime> diff --git a/src/System.Security.Cryptography.Pkcs/src/Resources/Strings.resx b/src/System.Security.Cryptography.Pkcs/src/Resources/Strings.resx index 6ddca11b80..1423017d91 100644 --- a/src/System.Security.Cryptography.Pkcs/src/Resources/Strings.resx +++ b/src/System.Security.Cryptography.Pkcs/src/Resources/Strings.resx @@ -100,4 +100,7 @@ <data name="InvalidOperation_WrongOidInAsnCollection" xml:space="preserve"> <value>AsnEncodedData element in the collection has wrong Oid value: expected = '{0}', actual = '{1}'.</value> </data> + <data name="PlatformNotSupported_CryptographyPkcs" xml:space="preserve"> + <value>System.Security.Cryptography.Pkcs is only supported on Windows platforms.</value> + </data> </root> diff --git a/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index 76edcd9759..dcdd7fccfc 100644 --- a/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -7,7 +7,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(IsPartialFacadeAssembly)' == 'true'">None</ResourcesSourceOutputDirectory> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_CryptographyPkcs</GeneratePlatformNotSupportedAssemblyMessage> <UsePackageTargetRuntimeDefaults Condition="'$(IsPartialFacadeAssembly)' != 'true'">true</UsePackageTargetRuntimeDefaults> </PropertyGroup> <!-- Don't delete these clauses even if they look useless. They tell the VS IDE that "Windows_Debug", etc., are @@ -19,7 +19,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND ('$(TargetGroup)' != 'netstandard' OR '$(TargetsWindows)' == 'true')"> <Compile Include="System\Security\Cryptography\CryptographicAttributeObject.cs" /> <Compile Include="System\Security\Cryptography\CryptographicAttributeObjectCollection.cs" /> <Compile Include="System\Security\Cryptography\CryptographicAttributeObjectEnumerator.cs" /> @@ -49,7 +49,7 @@ <Compile Include="System\Security\Cryptography\Xml\X509IssuerSerial.cs" /> </ItemGroup> <!-- Internal types (platform independent) --> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND ('$(TargetGroup)' != 'netstandard' OR '$(TargetsWindows)' == 'true')"> <Compile Include="Internal\Cryptography\DecryptorPal.cs" /> <Compile Include="Internal\Cryptography\KeyAgreeRecipientInfoPal.cs" /> <Compile Include="Internal\Cryptography\KeyLengths.cs" /> @@ -60,7 +60,7 @@ <Compile Include="Internal\Cryptography\RecipientInfoPal.cs" /> </ItemGroup> <!-- Internal types (platform: Windows) --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true'"> <Compile Include="Internal\Cryptography\Pal\Windows\AlgId.cs" /> <Compile Include="Internal\Cryptography\Pal\Windows\DecryptorPalWindows.cs" /> <Compile Include="Internal\Cryptography\Pal\Windows\DecryptorPalWindows.Decode.cs" /> @@ -80,7 +80,7 @@ <Compile Include="Microsoft\Win32\SafeHandles\SafeProvOrNCryptKeyHandleUwp.cs" /> </ItemGroup> <!-- Interop types (platform: Windows) --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true'"> <Compile Include="Interop\Windows\Crypt32\Interop.CERT_CONTEXT.cs" /> <Compile Include="Interop\Windows\Crypt32\Interop.CERT_ID.cs" /> <Compile Include="Interop\Windows\Crypt32\Interop.CERT_INFO.cs" /> @@ -140,7 +140,7 @@ <Compile Include="Interop\Windows\Heap\Interop.Heap.cs" /> </ItemGroup> <!-- Common types (platform: Windows) --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true'"> <Compile Include="$(CommonPath)\Internal\Cryptography\Windows\CryptoThrowHelper.cs"> <Link>Common\Internal\Cryptography\Windows\CryptoThrowHelper.cs</Link> </Compile> @@ -164,7 +164,7 @@ </Compile> </ItemGroup> <!-- Internal types (platform: Unix) --> - <ItemGroup Condition="'$(TargetsUnix)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(TargetsUnix)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true' AND '$(TargetGroup)' != 'netstandard'"> <Compile Include="Internal\Cryptography\Pal\Unix\PkcsPal.Unix.cs" /> </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> diff --git a/src/System.Security.Cryptography.ProtectedData/src/Resources/Strings.resx b/src/System.Security.Cryptography.ProtectedData/src/Resources/Strings.resx index 885ccce06a..7a1c8d546e 100644 --- a/src/System.Security.Cryptography.ProtectedData/src/Resources/Strings.resx +++ b/src/System.Security.Cryptography.ProtectedData/src/Resources/Strings.resx @@ -61,4 +61,7 @@ <data name="Cryptography_DpApi_ProfileMayNotBeLoaded" xml:space="preserve"> <value>The data protection operation was unsuccessful. This may have been caused by not having the user profile loaded for the current thread's user context, which may be the case when the thread is impersonating.</value> </data> + <data name="PlatformNotSupported_CryptographyProtectedData" xml:space="preserve"> + <value>Windows Data Protection API (DPAPI) is not supported on this platform.</value> + </data> </root> diff --git a/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj index 516b502720..c62b41e383 100644 --- a/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj +++ b/src/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj @@ -10,7 +10,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'netfx'">None</ResourcesSourceOutputDirectory> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_CryptographyProtectedData</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" /> @@ -18,7 +18,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(GeneratePlatformNotSupportedAssembly)' != 'true'"> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND ('$(TargetGroup)' != 'netstandard' OR '$(TargetsWindows)' == 'true')"> <Compile Include="System\Security\Cryptography\DataProtectionScope.cs" /> <Compile Include="System\Security\Cryptography\ProtectedData.cs" /> <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.CryptProtectData.cs"> diff --git a/src/System.Security.Principal.Windows/src/Resources/Strings.resx b/src/System.Security.Principal.Windows/src/Resources/Strings.resx index 0d6bccfc81..110a230dbd 100644 --- a/src/System.Security.Principal.Windows/src/Resources/Strings.resx +++ b/src/System.Security.Principal.Windows/src/Resources/Strings.resx @@ -118,4 +118,7 @@ <data name="IdentityReference_NotAWindowsDomain" xml:space="preserve"> <value>The domainSid parameter is not a valid Windows domain SID.</value> </data> + <data name="PlatformNotSupported_Principal" xml:space="preserve"> + <value>Windows Principal functionality is not supported on this platform.</value> + </data> </root>
\ No newline at end of file diff --git a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index 2a01573b69..e241ca1f02 100644 --- a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj @@ -7,7 +7,7 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'netfx'">None</ResourcesSourceOutputDirectory> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_Principal</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" /> diff --git a/src/System.ServiceProcess.ServiceController/src/Resources/Strings.resx b/src/System.ServiceProcess.ServiceController/src/Resources/Strings.resx index a538814ec8..7111ac4072 100644 --- a/src/System.ServiceProcess.ServiceController/src/Resources/Strings.resx +++ b/src/System.ServiceProcess.ServiceController/src/Resources/Strings.resx @@ -97,4 +97,7 @@ <data name="Timeout" xml:space="preserve"> <value>Time out has expired and the operation has not been completed.</value> </data> + <data name="PlatformNotSupported_ServiceController" xml:space="preserve"> + <value>ServiceController enables manipulating and accessing Windows services and it is not applicable for other operating systems.</value> + </data> </root>
\ No newline at end of file diff --git a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 3c46ad4427..5339d0a8fb 100644 --- a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -8,7 +8,7 @@ <ProjectGuid>{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'netfx'">None</ResourcesSourceOutputDirectory> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_ServiceController</GeneratePlatformNotSupportedAssemblyMessage> <!-- Although we have a netstandard configuration, we know we are not currently UAP compatible--> <UWPCompatible>false</UWPCompatible> </PropertyGroup> diff --git a/src/System.Threading.AccessControl/src/Resources/Strings.resx b/src/System.Threading.AccessControl/src/Resources/Strings.resx index f9218caebb..b4a5a6de41 100644 --- a/src/System.Threading.AccessControl/src/Resources/Strings.resx +++ b/src/System.Threading.AccessControl/src/Resources/Strings.resx @@ -61,4 +61,7 @@ <data name="WaitHandleCannotBeOpenedException_InvalidHandle" xml:space="preserve"> <value>A WaitHandle with system-wide name '{0}' cannot be created. A WaitHandle of a different type might have the same name.</value> </data> + <data name="PlatformNotSupported_AccessControl" xml:space="preserve"> + <value>Access Control List (ACL) APIs are part of resource management on Windows and are not supported on this platform.</value> + </data> </root>
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index aa084112b5..a70e0c3a0c 100644 --- a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -7,7 +7,7 @@ <PropertyGroup> <AssemblyName>System.Threading.AccessControl</AssemblyName> <ProjectGuid>{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}</ProjectGuid> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <!-- Default configurations to help VS understand the options --> diff --git a/src/System.Threading.Overlapped/src/Resources/Strings.resx b/src/System.Threading.Overlapped/src/Resources/Strings.resx index e8ba0b2633..cc125736f3 100644 --- a/src/System.Threading.Overlapped/src/Resources/Strings.resx +++ b/src/System.Threading.Overlapped/src/Resources/Strings.resx @@ -76,4 +76,7 @@ <data name="InvalidOperation_NativeOverlappedReused" xml:space="preserve"> <value>NativeOverlapped cannot be reused for multiple operations.</value> </data> + <data name="PlatformNotSupported_ThreadingOverlapped" xml:space="preserve"> + <value>System.Threading.Overlapped APIs are specific to the way in which Windows handles asynchronous I/O, and are not supported on this platform.</value> + </data> </root>
\ No newline at end of file diff --git a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj index 202af42403..1f816c1615 100644 --- a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj +++ b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj @@ -6,7 +6,7 @@ <ProjectGuid>{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly Condition="'$(TargetsWindows)' == 'true'">true</IsPartialFacadeAssembly> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_ThreadingOverlapped</GeneratePlatformNotSupportedAssemblyMessage> <GenFacadesIgnoreMissingTypes Condition="'$(TargetGroup)'=='uapaot'">true</GenFacadesIgnoreMissingTypes> </PropertyGroup> <!-- Help VS understand available configurations --> |