Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into runtime-p6
Browse files Browse the repository at this point in the history
  • Loading branch information
agocke committed Jul 15, 2022
2 parents e1b012a + 32f5873 commit 890efef
Show file tree
Hide file tree
Showing 588 changed files with 12,750 additions and 10,497 deletions.
4 changes: 3 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@
/src/native/public/mono @marek-safar @lambdageek

/src/libraries/sendtohelix-wasm.targets @radical
/src/mono/wasm @lewing
/src/mono/wasm @lewing @pavelsavara
/src/mono/wasm/debugger @thaystg @radical
/src/mono/wasm/build @radical
/src/mono/sample/wasm @lewing @pavelsavara
/src/libraries/System.Runtime.InteropServices.JavaScript @lewing @pavelsavara

/src/mono/nuget/*WebAssembly*/ @lewing @radical
/src/mono/nuget/*MonoTargets*/ @lewing @radical
Expand Down
3 changes: 0 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,6 @@
<Copyright>$(CopyrightNetFoundation)</Copyright>
<PackageThirdPartyNoticesFile>$(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
<PackageReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</PackageReleaseNotes>
<!-- Indicates this is not an officially supported release. Release branches should set this to false. -->
<!-- Keep it in sync with PRERELEASE in eng/native/configureplatform.cmake -->
<IsPrerelease>true</IsPrerelease>
<IsPrivateAssembly>$(MSBuildProjectName.Contains('Private'))</IsPrivateAssembly>
<!-- Private packages should not be stable -->
<SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(IsPrivateAssembly)">true</SuppressFinalPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion docs/area-owners.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
| area-System.Runtime.Caching | @HongGit | @StephenMolloy @HongGit | |
| area-System.Runtime.CompilerServices | @ericstj | @dotnet/area-system-runtime-compilerservices | |
| area-System.Runtime.InteropServices | @jeffschwMSFT | @AaronRobinsonMSFT @jkoritzinsky | Excluded:<ul><li>System.Runtime.InteropServices.RuntimeInfo</li></ul> |
| area-System.Runtime.InteropServices.JavaScript | @lewing | @kjpou1 | |
| area-System.Runtime.InteropServices.JavaScript | @lewing | @pavelsavara | |
| area-System.Runtime.Intrinsics | @jeffhandley | @dotnet/area-system-runtime-intrinsics | Consultants: @echesakovMSFT @kunalspathak |
| area-System.Security | @jeffhandley | @dotnet/area-system-security | |
| area-System.ServiceModel | @HongGit | @HongGit @mconnew | Repo: https://github.com/dotnet/WCF<br>Packages:<ul><li>System.ServiceModel.Primitives</li><li>System.ServiceModel.Http</li><li>System.ServiceModel.NetTcp</li><li>System.ServiceModel.Duplex</li><li>System.ServiceModel.Security</li></ul> |
Expand Down
Loading

0 comments on commit 890efef

Please sign in to comment.