Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port System.Speech to .NET Core #45941

Merged
merged 70 commits into from
Jan 8, 2021
Merged

Port System.Speech to .NET Core #45941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
b1ff39d
Initial sources, with banners
danmoseley Dec 20, 2020
033257f
Run the code formatter
danmoseley Dec 20, 2020
6783285
Fix hang in XUnit due to failing to complete all AsyncOperation-s
danmoseley Dec 20, 2020
e3b07b8
Remove reflection over RegistryKey
danmoseley Dec 20, 2020
96b87f6
Add ref and packaging
danmoseley Dec 22, 2020
bf0049a
Add tests
danmoseley Dec 20, 2020
8d8ea89
Add sln
danmoseley Dec 20, 2020
a0c77c6
Fix CS1584
danmoseley Dec 20, 2020
f696933
Fix CA1823
danmoseley Dec 20, 2020
3bd275c
Fix CA1834
danmoseley Dec 20, 2020
a414089
Unnecessary suppressions
danmoseley Dec 20, 2020
5611e0a
Fix SA1028
danmoseley Dec 20, 2020
25ac1ba
Fix CA1507
danmoseley Dec 20, 2020
84951f8
Fix CA1810
danmoseley Dec 20, 2020
038204b
Fix CA1825
danmoseley Dec 20, 2020
3cac68d
Fix CA1825
danmoseley Dec 20, 2020
90b2cc3
Unnecessary suppressions
danmoseley Dec 20, 2020
1164a06
Fix CA1805
danmoseley Dec 20, 2020
bc272fc
Fix IDE0004
danmoseley Dec 20, 2020
6933026
Fix IDE0090
danmoseley Dec 20, 2020
e9c9ba5
Remove CAS
danmoseley Dec 21, 2020
28ad00b
Remove tabs and dead code
danmoseley Dec 21, 2020
c13d53d
Unnecessary suppressions
danmoseley Dec 21, 2020
f456bff
Fix SA1212
danmoseley Dec 21, 2020
70662f2
Fix SA1121
danmoseley Dec 21, 2020
6eeb259
Disable SA1129
danmoseley Dec 21, 2020
3f986f3
Fix SA1206
danmoseley Dec 21, 2020
ce90e01
Fix SA1518
danmoseley Dec 21, 2020
ebc2514
Fix SA1617
danmoseley Dec 21, 2020
8b41ec6
Fix SA1001
danmoseley Dec 21, 2020
7783a25
Fix CS0618
danmoseley Dec 21, 2020
3502e38
Remove unnecessary comments
danmoseley Dec 21, 2020
7fc720f
Remove unnecessary whitespace
danmoseley Dec 21, 2020
ce9a647
Remove low value xml doc comments
danmoseley Dec 21, 2020
6ef01ed
Unused usings
danmoseley Dec 21, 2020
0b3f91b
dead files
danmoseley Dec 21, 2020
e42e358
Remove CAS
danmoseley Dec 21, 2020
672ad63
More junk
danmoseley Dec 21, 2020
36327c6
Fix obvious original bug
danmoseley Dec 21, 2020
cf63347
Remove/insert newlines
danmoseley Dec 21, 2020
ec64a3c
Remove reference to old design document
danmoseley Dec 21, 2020
8aa5d27
Fix spacing
danmoseley Dec 21, 2020
561651e
Fix typo name
danmoseley Dec 21, 2020
6f8d093
Fix file casing
danmoseley Dec 21, 2020
b493001
Remove dead code
danmoseley Dec 22, 2020
33b9409
Add to compat pack
danmoseley Dec 22, 2020
ed51236
Remove AppDomain etc
danmoseley Dec 22, 2020
bd81617
Fix casing of .NET
danmoseley Dec 22, 2020
440fa71
Remove low value XML docs
danmoseley Dec 22, 2020
4ed6ef4
Remove code that relies on compiling assemblies
danmoseley Dec 22, 2020
f0ac189
Fix inadvertently removed padding
danmoseley Dec 22, 2020
f0068b9
Use EDI to preserve stack when rethrowing
danmoseley Dec 22, 2020
9a12bee
Fix misaligned resource ID's to match sperror.h
danmoseley Dec 22, 2020
90a963a
Skip SpeechRecognitionEngine tests if no installed recognizers
danmoseley Dec 22, 2020
4102c1e
Fix misformatted string bug
danmoseley Dec 22, 2020
7866844
Logging for CI error
danmoseley Dec 22, 2020
feda9d8
Fix NRE trying to map phonemes for voice for culture for which we do …
danmoseley Dec 22, 2020
af8b533
Fix 153 spelling errors in comments using `Visual Studio Spell Checker`
danmoseley Dec 24, 2020
bec4448
Remove extraneous file
danmoseley Dec 24, 2020
d1ffb27
Fix spacing
danmoseley Dec 24, 2020
f24beac
Fix project reference
danmoseley Dec 24, 2020
182bbe0
Reorder properties in csproj
danmoseley Dec 24, 2020
a05008d
Change from netcoreapp2.0 to netcoreapp2.1
danmoseley Dec 25, 2020
dfcc7f6
Update src/libraries/System.Speech/pkg/System.Speech.pkgproj
danmoseley Dec 27, 2020
83c19bf
Add build error for targeting netcoreapp2.0
danmoseley Dec 28, 2020
4ab9c1f
Suppress new error during packaging testing
danmoseley Dec 28, 2020
8f06b02
Update System.Speech.targets
ViktorHofer Dec 28, 2020
884a1b3
Remove ref comments
danmoseley Jan 7, 2021
9859944
Update pkgproj
danmoseley Jan 7, 2021
0b347aa
Remove placeholder
danmoseley Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/libraries/Common/src/System/SR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#nullable enable
using System.Resources;
using System.Runtime.CompilerServices;

namespace System
{
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Runtime/Versioning/PlatformAttributes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ public TargetPlatformAttribute(string platformName) : base(platformName)
#else
internal
#endif
sealed class SupportedOSPlatformAttribute : OSPlatformAttribute
sealed class SupportedOSPlatformAttribute : OSPlatformAttribute
{
public SupportedOSPlatformAttribute (string platformName) : base(platformName)
public SupportedOSPlatformAttribute(string platformName) : base(platformName)
{
}
}
Expand Down
16 changes: 16 additions & 0 deletions src/libraries/System.Speech/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IsWindowsSpecific>true</IsWindowsSpecific>
danmoseley marked this conversation as resolved.
Show resolved Hide resolved
<PackageDescription>Provides types to perform speech synthesis and speech recognition.

Commonly Used Types
System.Speech.Synthesis.SpeechSynthesizer
System.Speech.Recognition.SpeechRecognizer</PackageDescription>
</PropertyGroup>
</Project>
31 changes: 31 additions & 0 deletions src/libraries/System.Speech/System.Speech.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30709.18
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Speech", "src\System.Speech.csproj", "{D6377882-BD90-46D6-AC60-83498E4BA2B3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Speech.Tests", "tests\System.Speech.Tests.csproj", "{E26B6065-4016-4385-9AB2-EEBE2C97CEE7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D6377882-BD90-46D6-AC60-83498E4BA2B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6377882-BD90-46D6-AC60-83498E4BA2B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6377882-BD90-46D6-AC60-83498E4BA2B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6377882-BD90-46D6-AC60-83498E4BA2B3}.Release|Any CPU.Build.0 = Release|Any CPU
{E26B6065-4016-4385-9AB2-EEBE2C97CEE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E26B6065-4016-4385-9AB2-EEBE2C97CEE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E26B6065-4016-4385-9AB2-EEBE2C97CEE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E26B6065-4016-4385-9AB2-EEBE2C97CEE7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5BD9DF41-48EC-4FB8-998D-122857C5CA73}
EndGlobalSection
EndGlobal
16 changes: 16 additions & 0 deletions src/libraries/System.Speech/pkg/System.Speech.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Speech.csproj">
<SupportedFramework>netcoreapp2.0;net45;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Speech.csproj" />
<InboxOnTargetFramework Include="net45">
<AsFrameworkReference>true</AsFrameworkReference>
</InboxOnTargetFramework>
<PackageFile Include=".\build\System.Speech.targets">
danmoseley marked this conversation as resolved.
Show resolved Hide resolved
<TargetPath>build\netcoreapp2.0\</TargetPath>
</PackageFile>
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
7 changes: 7 additions & 0 deletions src/libraries/System.Speech/pkg/build/System.Speech.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project InitialTargets="_ValidateSystemSpeechNotNetCoreApp20">
<Target Name="_ValidateSystemSpeechNotNetCoreApp20"
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFrameworkVersion)' == 'v2.0'">
<Error Condition="'$(SuppressTfmSupportBuildWarnings)' == ''"
Code="SYSLIB9000" Text="System.Speech doesn't support netcoreapp2.0. Consider updating your TargetFramework to netcoreapp2.1 or later." />
</Target>
</Project>
1,157 changes: 1,157 additions & 0 deletions src/libraries/System.Speech/ref/System.Speech.cs
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions src/libraries/System.Speech/ref/System.Speech.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
danmoseley marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>
<ItemGroup>
<Compile Include="System.Speech.cs" />
</ItemGroup>
</Project>
Loading