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

Jump to bottom

[release/5.0] Backport System.Speech to compat pack #46729

Merged
merged 11 commits into from
Jan 14, 2021
Merged

[release/5.0] Backport System.Speech to compat pack #46729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
111a232
Port System.Speech to .NET Core (#45941)
danmoseley Jan 8, 2021
b47f75b
Fix port
danmoseley Jan 8, 2021
b0f606f
Disable some Speech tests on Server Core
danmoseley Jan 8, 2021
f14cbd6
Set PackageVersion in Directory.Build.props
danmoseley Jan 8, 2021
de4d121
Change packageIndex back to 5.0.0
danmoseley Jan 8, 2021
236382e
Don't rev the platforms package unless we ship it
ericstj Jan 7, 2021
e9a7ec3
Fix PKT
danmoseley Jan 9, 2021
00cdd67
Add to libraries-packages.proj
danmoseley Jan 9, 2021
53c866d
Fix SAPI error code mappings (#46841)
danmoseley Jan 12, 2021
bbe5d49
Merge branch 'release/5.0' into port.speech
Anipik Jan 14, 2021
f0ee366
Merge branch 'release/5.0' into port.speech
Anipik Jan 14, 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
12 changes: 12 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,12 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<PackageVersion>5.0.0</PackageVersion>
<!-- 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>MicrosoftShared</StrongNameKeyId>
<IsWindowsSpecific>true</IsWindowsSpecific>
</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">
<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>
</PropertyGroup>
<ItemGroup>
<Compile Include="System.Speech.cs" />
</ItemGroup>
</Project>
Loading