You've already forked linux-packaging-mono
Imported Upstream version 5.2.0.175
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
4bdbaf4a88
commit
966bba02bb
@@ -1,61 +1,50 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.22512.0
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages.Tests", "tests\System.Text.Encoding.CodePages.Tests.csproj", "{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages.Tests", "tests\System.Text.Encoding.CodePages.Tests.csproj", "{835AD07B-7C9A-406F-B16F-59B3B0D017A4}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47} = {16EE6633-F557-5C9E-9EF3-B5334B044F47}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages", "src\System.Text.Encoding.CodePages.csproj", "{16EE6633-F557-5C9E-9EF3-B5334B044F47}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25} = {73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages", "ref\System.Text.Encoding.CodePages.csproj", "{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}"
|
||||
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
|
||||
DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU = DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU
|
||||
ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU = ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU
|
||||
DebugNETCoreAppnetstandard-Unixnetstandard|AnyCPU = DebugNETCoreAppnetstandard-Unixnetstandard|AnyCPU
|
||||
ReleaseNETCoreAppnetstandard-Unixnetstandard|AnyCPU = ReleaseNETCoreAppnetstandard-Unixnetstandard|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-Windows_NTnetstandard|AnyCPU = DebugNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU
|
||||
ReleaseNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU = ReleaseNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.DebugNETCoreAppnetstandard-Unixnetstandard|AnyCPU.ActiveCfg = netstandard-Debug|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.DebugNETCoreAppnetstandard-Unixnetstandard|AnyCPU.Build.0 = netstandard-Debug|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.ReleaseNETCoreAppnetstandard-Unixnetstandard|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.ReleaseNETCoreAppnetstandard-Unixnetstandard|AnyCPU.Build.0 = netstandard-Release|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Debug|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard1.3-Windows_NT-Release|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.DebugNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU.ActiveCfg = netstandard-Debug|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.DebugNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU.Build.0 = netstandard-Debug|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU.ActiveCfg = netstandard-Release|Any CPU
|
||||
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU.Build.0 = netstandard-Release|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.DebugNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.ReleaseNETCoreAppnetstandard-Unixnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.DebugNETCoreAppnetstandard-Unixnetstandard|AnyCPU.ActiveCfg = netstandard-Unix-Debug|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.DebugNETCoreAppnetstandard-Unixnetstandard|AnyCPU.Build.0 = netstandard-Unix-Debug|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.ReleaseNETCoreAppnetstandard-Unixnetstandard|AnyCPU.ActiveCfg = netstandard-Unix-Release|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.ReleaseNETCoreAppnetstandard-Unixnetstandard|AnyCPU.Build.0 = netstandard-Unix-Release|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.DebugNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard1.3-Windows_NT|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.DebugNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.DebugNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.ReleaseNETCoreAppnetstandard-Windows_NTnetstandard|AnyCPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
|
||||
{835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
|
||||
{835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
|
||||
{835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
|
||||
{835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
|
||||
{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
|
||||
{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
|
||||
{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
|
||||
{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{835AD07B-7C9A-406F-B16F-59B3B0D017A4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
|
||||
{16EE6633-F557-5C9E-9EF3-B5334B044F47} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
|
||||
{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@@ -3,7 +3,5 @@
|
||||
<Import Project="..\dir.props" />
|
||||
<PropertyGroup>
|
||||
<AssemblyVersion>4.1.0.0</AssemblyVersion>
|
||||
<IsNETCoreApp>true</IsNETCoreApp>
|
||||
<IsNETCoreAppRef>false</IsNETCoreAppRef>
|
||||
</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.Text.Encoding.CodePages.pkgproj" />
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
|
||||
</Project>
|
||||
@@ -5,7 +5,7 @@
|
||||
<ProjectReference Include="..\ref\System.Text.Encoding.CodePages.csproj">
|
||||
<SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\src\System.Text.Encoding.CodePages.builds" />
|
||||
<ProjectReference Include="..\src\System.Text.Encoding.CodePages.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<InboxOnTargetFramework Include="MonoAndroid10" />
|
||||
|
||||
@@ -1,9 +1,15 @@
|
||||
<?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>{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}</ProjectGuid>
|
||||
<!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref -->
|
||||
<PackageTargetFramework>netstandard2.0;uap10.1</PackageTargetFramework>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
|
||||
<ItemGroup>
|
||||
<SuppressPackageTargetFrameworkCompatibility Include="uap10.1" />
|
||||
<Compile Include="System.Text.Encoding.CodePages.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
<BuildConfigurations>
|
||||
netcoreapp-Unix;
|
||||
netcoreapp-Windows_NT;
|
||||
uap-Windows_NT;
|
||||
netstandard-Windows_NT;
|
||||
</BuildConfigurations>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -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">
|
||||
@@ -132,9 +73,6 @@
|
||||
<data name="NotSupported_NoCodepageData" xml:space="preserve">
|
||||
<value>No data is available for encoding {0}.</value>
|
||||
</data>
|
||||
<data name="Arg_OutOfMemoryException" xml:space="preserve">
|
||||
<value>Insufficient memory to continue the execution of the program.</value>
|
||||
</data>
|
||||
<data name="Argument_EncodingConversionOverflowBytes" xml:space="preserve">
|
||||
<value>The output byte buffer is too small to contain the encoded data, encoding '{0}' fallback '{1}'.</value>
|
||||
</data>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?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>
|
||||
@@ -9,10 +9,14 @@
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
<!-- Help VS understand available configurations -->
|
||||
<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)' == '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)' == 'netstandard-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft\Win32\SafeHandles\SafeAllocHHandle.cs" />
|
||||
<Compile Include="System\Text\BaseCodePageEncoding.cs" />
|
||||
@@ -81,4 +85,4 @@
|
||||
<OutputDataTablePath>System\Text\EncodingTable.Data.cs</OutputDataTablePath>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(ToolsDir)encoding.targets" Condition="Exists('$(ToolsDir)encoding.targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
@@ -211,13 +211,13 @@ namespace System.Text
|
||||
s_codePagesEncodingDataStream.Seek(CODEPAGE_DATA_FILE_HEADER_SIZE, SeekOrigin.Begin);
|
||||
|
||||
int codePagesCount;
|
||||
fixed (byte* pBytes = s_codePagesDataHeader)
|
||||
fixed (byte* pBytes = &s_codePagesDataHeader[0])
|
||||
{
|
||||
CodePageDataFileHeader* pDataHeader = (CodePageDataFileHeader*)pBytes;
|
||||
codePagesCount = pDataHeader->CodePageCount;
|
||||
}
|
||||
|
||||
fixed (byte* pBytes = codePageIndex)
|
||||
fixed (byte* pBytes = &codePageIndex[0])
|
||||
{
|
||||
CodePageIndex* pCodePageIndex = (CodePageIndex*)pBytes;
|
||||
for (int i = 0; i < codePagesCount; i++)
|
||||
@@ -268,13 +268,13 @@ namespace System.Text
|
||||
s_codePagesEncodingDataStream.Seek(CODEPAGE_DATA_FILE_HEADER_SIZE, SeekOrigin.Begin);
|
||||
|
||||
int codePagesCount;
|
||||
fixed (byte* pBytes = s_codePagesDataHeader)
|
||||
fixed (byte* pBytes = &s_codePagesDataHeader[0])
|
||||
{
|
||||
CodePageDataFileHeader* pDataHeader = (CodePageDataFileHeader*)pBytes;
|
||||
codePagesCount = pDataHeader->CodePageCount;
|
||||
}
|
||||
|
||||
fixed (byte* pBytes = codePageIndex)
|
||||
fixed (byte* pBytes = &codePageIndex[0])
|
||||
{
|
||||
CodePageIndex* pCodePageIndex = (CodePageIndex*)pBytes;
|
||||
for (int i = 0; i < codePagesCount; i++)
|
||||
|
||||
@@ -79,7 +79,9 @@ namespace System.Text
|
||||
[System.Security.SecurityCritical] // auto-generated
|
||||
protected override unsafe void LoadManagedCodePage()
|
||||
{
|
||||
fixed (byte* pBytes = m_codePageHeader)
|
||||
Debug.Assert(m_codePageHeader?.Length > 0);
|
||||
|
||||
fixed (byte* pBytes = &m_codePageHeader[0])
|
||||
{
|
||||
CodePageHeader* pCodePage = (CodePageHeader*)pBytes;
|
||||
|
||||
|
||||
@@ -149,7 +149,7 @@ namespace System.Text
|
||||
bytes = new byte[1];
|
||||
|
||||
// Just call pointer version
|
||||
fixed (byte* pBytes = bytes)
|
||||
fixed (byte* pBytes = &bytes[0])
|
||||
return GetCharCount(pBytes + index, count, flush);
|
||||
}
|
||||
|
||||
@@ -206,8 +206,8 @@ namespace System.Text
|
||||
chars = new char[1];
|
||||
|
||||
// Just call pointer version
|
||||
fixed (byte* pBytes = bytes)
|
||||
fixed (char* pChars = chars)
|
||||
fixed (byte* pBytes = &bytes[0])
|
||||
fixed (char* pChars = &chars[0])
|
||||
// Remember that charCount is # to decode, not size of array
|
||||
return GetChars(pBytes + byteIndex, byteCount,
|
||||
pChars + charIndex, charCount, flush);
|
||||
@@ -265,9 +265,9 @@ namespace System.Text
|
||||
chars = new char[1];
|
||||
|
||||
// Just call the pointer version (public overrides can't do this)
|
||||
fixed (byte* pBytes = bytes)
|
||||
fixed (byte* pBytes = &bytes[0])
|
||||
{
|
||||
fixed (char* pChars = chars)
|
||||
fixed (char* pChars = &chars[0])
|
||||
{
|
||||
Convert(pBytes + byteIndex, byteCount, pChars + charIndex, charCount, flush,
|
||||
out bytesUsed, out charsUsed, out completed);
|
||||
|
||||
@@ -159,7 +159,7 @@ namespace System.Text
|
||||
|
||||
// Just call the pointer version
|
||||
int result = -1;
|
||||
fixed (char* pChars = chars)
|
||||
fixed (char* pChars = &chars[0])
|
||||
{
|
||||
result = GetByteCount(pChars + index, count, flush);
|
||||
}
|
||||
@@ -208,8 +208,8 @@ namespace System.Text
|
||||
bytes = new byte[1];
|
||||
|
||||
// Just call pointer version
|
||||
fixed (char* pChars = chars)
|
||||
fixed (byte* pBytes = bytes)
|
||||
fixed (char* pChars = &chars[0])
|
||||
fixed (byte* pBytes = &bytes[0])
|
||||
|
||||
// Remember that charCount is # to decode, not size of array.
|
||||
return GetBytes(pChars + charIndex, charCount,
|
||||
@@ -264,9 +264,9 @@ namespace System.Text
|
||||
bytes = new byte[1];
|
||||
|
||||
// Just call the pointer version (can't do this for non-msft encoders)
|
||||
fixed (char* pChars = chars)
|
||||
fixed (char* pChars = &chars[0])
|
||||
{
|
||||
fixed (byte* pBytes = bytes)
|
||||
fixed (byte* pBytes = &bytes[0])
|
||||
{
|
||||
Convert(pChars + charIndex, charCount, pBytes + byteIndex, byteCount, flush,
|
||||
out charsUsed, out bytesUsed, out completed);
|
||||
|
||||
@@ -90,7 +90,7 @@ namespace System.Text
|
||||
[System.Security.SecurityCritical] // auto-generated
|
||||
internal unsafe void AdjustBytes(int count)
|
||||
{
|
||||
_bytes += count;
|
||||
_bytes = unchecked(_bytes + count);
|
||||
}
|
||||
|
||||
internal unsafe bool MoreData
|
||||
@@ -125,7 +125,7 @@ namespace System.Text
|
||||
[System.Security.SecurityCritical] // auto-generated
|
||||
get
|
||||
{
|
||||
return (int)(_bytes - _byteStart);
|
||||
return unchecked((int)(_bytes - _byteStart));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ namespace System.Text
|
||||
return 0;
|
||||
|
||||
// Just call the pointer version
|
||||
fixed (char* pChars = chars)
|
||||
fixed (char* pChars = &chars[0])
|
||||
return GetByteCount(pChars + index, count, null);
|
||||
}
|
||||
|
||||
@@ -130,7 +130,7 @@ namespace System.Text
|
||||
bytes = new byte[1];
|
||||
|
||||
fixed (char* pChars = s)
|
||||
fixed (byte* pBytes = bytes)
|
||||
fixed (byte* pBytes = &bytes[0])
|
||||
return GetBytes(pChars + charIndex, charCount,
|
||||
pBytes + byteIndex, byteCount, null);
|
||||
}
|
||||
@@ -176,8 +176,8 @@ namespace System.Text
|
||||
if (bytes.Length == 0)
|
||||
bytes = new byte[1];
|
||||
|
||||
fixed (char* pChars = chars)
|
||||
fixed (byte* pBytes = bytes)
|
||||
fixed (char* pChars = &chars[0])
|
||||
fixed (byte* pBytes = &bytes[0])
|
||||
// Remember that byteCount is # to decode, not size of array.
|
||||
return GetBytes(pChars + charIndex, charCount,
|
||||
pBytes + byteIndex, byteCount, null);
|
||||
@@ -224,7 +224,7 @@ namespace System.Text
|
||||
return 0;
|
||||
|
||||
// Just call pointer version
|
||||
fixed (byte* pBytes = bytes)
|
||||
fixed (byte* pBytes = &bytes[0])
|
||||
return GetCharCount(pBytes + index, count, null);
|
||||
}
|
||||
|
||||
@@ -276,8 +276,8 @@ namespace System.Text
|
||||
if (chars.Length == 0)
|
||||
chars = new char[1];
|
||||
|
||||
fixed (byte* pBytes = bytes)
|
||||
fixed (char* pChars = chars)
|
||||
fixed (byte* pBytes = &bytes[0])
|
||||
fixed (char* pChars = &chars[0])
|
||||
// Remember that charCount is # to decode, not size of array
|
||||
return GetChars(pBytes + byteIndex, byteCount,
|
||||
pChars + charIndex, charCount, null);
|
||||
@@ -322,7 +322,7 @@ namespace System.Text
|
||||
// Avoid problems with empty input buffer
|
||||
if (bytes.Length == 0) return String.Empty;
|
||||
|
||||
fixed (byte* pBytes = bytes)
|
||||
fixed (byte* pBytes = &bytes[0])
|
||||
return GetString(pBytes + index, count);
|
||||
}
|
||||
|
||||
|
||||
@@ -177,7 +177,10 @@ namespace System.Text
|
||||
mapUnicodeToBytes[unicodeCount] = count4Byte;
|
||||
// Set the flag saying its a 4 byte sequence
|
||||
mapUnicodeTo4BytesFlags[unicodeCount / 8] |= unchecked((byte)(1 << (unicodeCount % 8)));
|
||||
unicodeCount++;
|
||||
unchecked
|
||||
{
|
||||
unicodeCount++;
|
||||
}
|
||||
count4Byte++;
|
||||
data--;
|
||||
}
|
||||
|
||||
@@ -479,7 +479,7 @@ namespace System.Text
|
||||
}
|
||||
|
||||
// Make sure we're in the right mode (JIS 0208 or JIS 0212)
|
||||
// Note: Right now we don't use JIS 0212. Also this table'd be wrong
|
||||
// Note: Right now we don't use JIS 0212. Also this table would be wrong
|
||||
|
||||
// Its JIS extension 0208
|
||||
if (currentMode != ISO2022Modes.ModeJIS0208)
|
||||
@@ -1656,14 +1656,14 @@ namespace System.Text
|
||||
}
|
||||
|
||||
// Just ASCII
|
||||
// We allow some chars > 7f because everett did, so we have to look them up.
|
||||
// We allow some chars > 7f because Everett did, so we have to look them up.
|
||||
STOREASCII:
|
||||
char c = mapBytesToUnicode[ch];
|
||||
|
||||
// Check if it was unknown
|
||||
if ((c == UNKNOWN_CHAR_FLAG || c == 0) && (ch != 0))
|
||||
{
|
||||
// fallback the unkown bytes
|
||||
// fallback the unknown bytes
|
||||
if (!buffer.Fallback((byte)ch))
|
||||
break;
|
||||
continue;
|
||||
|
||||
@@ -75,7 +75,9 @@ namespace System.Text
|
||||
[System.Security.SecurityCritical] // auto-generated
|
||||
protected override unsafe void LoadManagedCodePage()
|
||||
{
|
||||
fixed (byte* pBytes = m_codePageHeader)
|
||||
Debug.Assert(m_codePageHeader?.Length > 0);
|
||||
|
||||
fixed (byte* pBytes = &m_codePageHeader[0])
|
||||
{
|
||||
CodePageHeader* pCodePage = (CodePageHeader*)pBytes;
|
||||
// Should be loading OUR code page
|
||||
@@ -116,7 +118,7 @@ namespace System.Text
|
||||
s_codePagesEncodingDataStream.Read(buffer, 0, buffer.Length);
|
||||
}
|
||||
|
||||
fixed (byte* pBuffer = buffer)
|
||||
fixed (byte* pBuffer = &buffer[0])
|
||||
{
|
||||
char* pTemp = (char*)pBuffer;
|
||||
for (int b = 0; b < 256; b++)
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<BuildConfigurations>
|
||||
netstandard1.3-Windows_NT;
|
||||
netstandard;
|
||||
</BuildConfigurations>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -1,17 +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.Text.Encoding.CodePages.Tests.csproj" />
|
||||
<Project Include="System.Text.Encoding.CodePages.Tests.csproj">
|
||||
<OSGroup>Windows_NT</OSGroup>
|
||||
<TestTFMs>net463</TestTFMs>
|
||||
</Project>
|
||||
<Project Include="System.Text.Encoding.CodePages.Tests.csproj">
|
||||
<TargetGroup>netstandard1.3</TargetGroup>
|
||||
<OSGroup>Windows_NT</OSGroup>
|
||||
<TestTFMs>netcore50;netcoreapp1.0;net46</TestTFMs>
|
||||
</Project>
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
|
||||
</Project>
|
||||
@@ -1,22 +1,18 @@
|
||||
<?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>
|
||||
<ProjectGuid>{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}</ProjectGuid>
|
||||
<ProjectGuid>{835AD07B-7C9A-406F-B16F-59B3B0D017A4}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<!-- Default configurations to help VS understand the configurations -->
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
|
||||
<ItemGroup>
|
||||
<Compile Include="EncodingCodePages.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
|
||||
<Compile Include="EncodingCodePages.netstandard.cs" />
|
||||
<Compile Include="$(CommonTestPath)\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
|
||||
<Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
|
||||
</Project>
|
||||
</Project>
|
||||
Reference in New Issue
Block a user