forked from hawkerm/monaco-editor-uwp
-
Notifications
You must be signed in to change notification settings - Fork 7
Skia support, multi-editors, monaco updates #28
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.
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
Open
clairernovotny
wants to merge
51
commits into
uno
Choose a base branch
from
dev/cnov/monaco-updates
base: uno
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
51 commits
Select commit
Hold shift + click to select a range
0fdc237
wip
jeromelaban e342be9
wip
jeromelaban 66a9715
wip
jeromelaban 34f29f1
wip
jeromelaban e1ee696
nullable
jeromelaban e87691c
more nullable
jeromelaban 91de2e3
more fixes
jeromelaban 573c03f
chore: Adjust format
jeromelaban 009df7d
Update to use latest uno 6 templates
jeromelaban e372c73
update to uno latest
jeromelaban 9188eac
chore: Add missing file
jeromelaban f6c108c
Update dependency versions
clairernovotny e107b04
Update to latest Monaco (0.52.0)
clairernovotny a97cb77
Auto add and activate tab
clairernovotny 4e45c7b
NullReferenceException repro
clairernovotny 71a2325
Add missing styles
MartinZikmund a0b2055
Add resources for 6.3
clairernovotny 34b6abd
Don't refresh layout until editor is fully loaded
clairernovotny ecce003
use private sdk
clairernovotny 3763ba3
add simple test page
clairernovotny b1c02f6
Update to latest sdks
clairernovotny 66c1f57
Update Uno.WinUI version and add net10.0 support
clairernovotny f3841a1
Update to Monaco Editor 0.54
clairernovotny c94facc
Refactor and cleanup project files
clairernovotny 9ebd568
Update Uno dependencies and project configurations
clairernovotny f66480a
Properly include all of the monaco files
clairernovotny f2e2c55
Switch to Nerdbank.GitVersioning and update metadata
clairernovotny a6d465e
Improve build process and packaging rules
clairernovotny 7a68e69
Update CI pipeline and simplify solution structure
clairernovotny cbd14fa
Code cleanup
clairernovotny e257e90
Refactor: Modernize codebase with C# 9+ features
clairernovotny 3ac05b7
Added a call to `NativeMethods.RefreshLayout` after `NativeMethods.In…
clairernovotny 867633f
Enhance editor API with documentation and new features
clairernovotny 675822c
Make CodeEditor properties public for external access
clairernovotny 908545b
restore generatelibrarylayout
clairernovotny cf0f811
Refactor MonacoEditorComponent project file
clairernovotny b323f31
Update packaging behavior and TFM handling
clairernovotny e64dab9
Set IncludeContentInPack to false in project file
clairernovotny c63a67d
Added `<clear />` tags to `<packageSources>` to remove any pre-existi…
clairernovotny 8cd90a3
Set name to Build
clairernovotny 2246c37
Simplify artifact publishing and fix variable casing
clairernovotny 4486014
fix case
clairernovotny 5fce140
Refine artifact publishing and add dynamic source root
clairernovotny fe7ccf3
Ensure directory path in SourceRoot Include attribute
clairernovotny 354fa84
added copilot setup
clairernovotny 7bf9808
set sdk ver
clairernovotny a68a6be
Apply initial property values on CodeEditor load to fix initializatio…
Copilot 3793f4c
Add FileExtension property to infer code language
clairernovotny 8a0d4e3
Make DebugLogger accessible to JavaScript in UWP apps
clairernovotny e541d51
Refactor language detection by file extension
clairernovotny b8530c2
Update JS import for LanguageIdFromExtension method
clairernovotny File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,29 @@ | ||
| [*.cs] | ||
| root = true | ||
|
|
||
| [*] | ||
| indent_style = space | ||
|
|
||
| [*.cs] | ||
| indent_size = 4 | ||
| charset = utf-8 | ||
| tab_width = 4 | ||
| end_of_line = crlf | ||
|
|
||
| # Sort using and Import directives with System.* appearing first | ||
| dotnet_sort_system_directives_first = true | ||
|
|
||
| # CS1591: Missing XML comment for publicly visible type or member | ||
| dotnet_diagnostic.CS1591.severity = none | ||
|
|
||
| # Namespace declarations should match folder structure | ||
| dotnet_diagnostic.IDE0130.severity = none | ||
|
|
||
| # IDE0060: Remove unused parameter | ||
| dotnet_diagnostic.IDE0060.severity = silent | ||
|
|
||
| # Xml files | ||
| [*.{xml,xaml,config,nuspec,resx,vsixmanifest,csproj,targets,props,fsproj}] | ||
| indent_size = 2 | ||
|
|
||
| [*.json] | ||
| indent_size = 2 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| name: "Copilot Setup Steps" | ||
|
|
||
| # Automatically run the setup steps when they are changed to allow for easy validation, and | ||
| # allow manual testing through the repository's "Actions" tab | ||
| on: | ||
| workflow_dispatch: | ||
| push: | ||
| paths: | ||
| - .github/workflows/copilot-setup-steps.yml | ||
| pull_request: | ||
| paths: | ||
| - .github/workflows/copilot-setup-steps.yml | ||
|
|
||
| jobs: | ||
| # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot. | ||
| copilot-setup-steps: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| # Set the permissions to the lowest permissions possible needed for your steps. | ||
| # Copilot will be given its own token for its operations. | ||
| permissions: | ||
| # If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission. If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete. | ||
| contents: read | ||
|
|
||
| # You can define any steps you want, and they will run before the agent starts. | ||
| # If you do not check out your code, Copilot will do this for you. | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v5 | ||
| with: | ||
| fetch-depth: 0 | ||
| fetch-tags: true | ||
|
|
||
| - uses: actions/setup-dotnet@v5 | ||
| with: | ||
| global-json-file: global.json | ||
|
|
||
| - run: | | ||
| dotnet workload install wasm-tools wasm-tools-net9 | ||
| dotnet tool install --tool-path . nbgv | ||
| ./nbgv cloud -c -a | ||
| dotnet restore |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,45 @@ | ||
| jobs: | ||
| - job: Windows | ||
|
|
||
| - job: Build | ||
| pool: | ||
| vmImage: 'windows-2022' | ||
| vmImage: 'ubuntu-latest' | ||
|
|
||
| steps: | ||
| - template: build/templates/gitversion.yml | ||
| - template: build/templates/gitversion-run.yml | ||
|
|
||
| - task: UseDotNet@2 | ||
| displayName: 'Use .Net Core runtime 3.1.x' | ||
| displayName: 'Use .NET 10 SDK' | ||
| inputs: | ||
| packageType: runtime | ||
| version: 5.0.x | ||
|
|
||
| - powershell: .\build\Install-WindowsSdkISO.ps1 19041 | ||
| displayName: Windows SDK Install | ||
| includePreviewVersions: true | ||
| version: 10.x | ||
| - script: dotnet workload install wasm-tools wasm-tools-net9 | ||
| displayName: Install workloads | ||
|
|
||
| - task: MSBuild@1 | ||
| - task: DotNetCoreCLI@2 | ||
| inputs: | ||
| solution: MonacoEditorComponent.sln | ||
| msbuildArguments: /r /p:Configuration=Release "/p:PackageOutputPath=$(build.artifactstagingdirectory)\nuget" "/p:PackageVersion=$(GITVERSION.FullSemVer)" "/p:InformationalVersion=$(GITVERSION.InformationalVersion)" /detailedsummary | ||
| command: build | ||
| projects: MonacoEditorComponent.slnx | ||
| arguments: -c Release -p:ArtifactsPath=$(Build.ArtifactStagingDirectory) /bl:$(Build.ArtifactStagingDirectory)/log/build.binlog | ||
|
|
||
| - task: PowerShell@2 | ||
| displayName: Authenticode Sign Packages | ||
| inputs: | ||
| filePath: build/Sign-Package.ps1 | ||
| env: | ||
| SignClientUser: $(SignClientUser) | ||
| SignClientSecret: $(SignClientSecret) | ||
| SignPackageName: "uno.monaco-editor-uwp" | ||
| SignPackageDescription: "uno.monaco-editor-uwp" | ||
| ArtifactDirectory: $(build.artifactstagingdirectory) | ||
| condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], ''))) | ||
| # - task: PowerShell@2 | ||
| # displayName: Authenticode Sign Packages | ||
| # inputs: | ||
| # filePath: build/Sign-Package.ps1 | ||
| # env: | ||
| # SignClientUser: $(SignClientUser) | ||
| # SignClientSecret: $(SignClientSecret) | ||
| # SignPackageName: "uno.monaco-editor-uwp" | ||
| # SignPackageDescription: "uno.monaco-editor-uwp" | ||
| # ArtifactDirectory: $(Build.ArtifactStagingDirectory) | ||
| # condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], ''))) | ||
|
|
||
| - publish: $(Build.ArtifactStagingDirectory)/package/release | ||
| displayName: Publish Build Logs | ||
| condition: always() | ||
| artifact: packages | ||
|
|
||
| - publish: $(Build.ArtifactStagingDirectory)/log | ||
| displayName: Publish Build Logs | ||
| condition: always() | ||
| artifact: logs | ||
|
|
||
| - task: PublishBuildArtifacts@1 | ||
| inputs: | ||
| PathtoPublish: $(build.artifactstagingdirectory) | ||
| ArtifactName: uno-monaco-editor-uwp-drop | ||
| ArtifactType: Container |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <LangVersion>latest</LangVersion> | ||
| <Nullable>enable</Nullable> | ||
| <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> | ||
| <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | ||
| <UseArtifactsOutput>true</UseArtifactsOutput> | ||
| <!-- | ||
| Adding NoWarn to remove build warnings | ||
| NU1507: Warning when there are multiple package sources when using CPM with no source mapping | ||
| NETSDK1201: Warning that specifying RID won't create self containing app | ||
| PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk) | ||
| --> | ||
| <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257;CS1998</NoWarn> | ||
| <ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">true</ContinuousIntegrationBuild> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <Project> | ||
| <ItemGroup> | ||
| <SourceRoot Condition="'$(ArtifactsPath)' != '' and !HasTrailingSlash('$(ArtifactsPath)')" Include="$(ArtifactsPath)\" /> | ||
| <SourceRoot Condition="'$(ArtifactsPath)' != '' and HasTrailingSlash('$(ArtifactsPath)')" Include="$(ArtifactsPath)" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <Project ToolsVersion="15.0"> | ||
| <!-- | ||
| To update the version of Uno, you should instead update the Sdk version in the global.json file. | ||
| See https://aka.platform.uno/using-uno-sdk for more information. | ||
| See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages. | ||
| --> | ||
| <ItemGroup> | ||
| <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" /> | ||
| <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" /> | ||
| <PackageVersion Include="Uno.CommunityToolkit.WinUI" Version="7.1.204" /> | ||
| <PackageVersion Include="Uno.WinUI" Version="6.4.0-dev.235" /> | ||
| <PackageVersion Include="Uno.Core.Extensions.Logging" Version="4.1.1" /> | ||
| <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.1.1" /> | ||
| <PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.9.3" /> | ||
| <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.8.118"/> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Didn't know we can do that. That's nice. |
||
| </ItemGroup> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,23 @@ | ||||||||||||||||||||
| <Solution> | ||||||||||||||||||||
| <Configurations> | ||||||||||||||||||||
| <Platform Name="Any CPU" /> | ||||||||||||||||||||
| <Platform Name="ARM" /> | ||||||||||||||||||||
| <Platform Name="ARM64" /> | ||||||||||||||||||||
| <Platform Name="x64" /> | ||||||||||||||||||||
| <Platform Name="x86" /> | ||||||||||||||||||||
| </Configurations> | ||||||||||||||||||||
| <Folder Name="/Solution Items/"> | ||||||||||||||||||||
|
Comment on lines
+2
to
+9
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Pretty sure
Suggested change
|
||||||||||||||||||||
| <File Path=".editorconfig" /> | ||||||||||||||||||||
| <File Path="changelog.md" /> | ||||||||||||||||||||
| <File Path="Directory.Build.props" /> | ||||||||||||||||||||
| <File Path="Directory.Build.targets" /> | ||||||||||||||||||||
| <File Path="Directory.Packages.props" /> | ||||||||||||||||||||
| <File Path="global.json" /> | ||||||||||||||||||||
| <File Path="install-dependencies.ps1" /> | ||||||||||||||||||||
| <File Path="MonacoEditorComponent/MonacoEditorComponent.nuspec" /> | ||||||||||||||||||||
| <File Path="README.md" /> | ||||||||||||||||||||
| <File Path="ThirdPartyNotices.txt" /> | ||||||||||||||||||||
| </Folder> | ||||||||||||||||||||
| <Project Path="MonacoEditorComponent/MonacoEditorComponent.csproj" /> | ||||||||||||||||||||
| <Project Path="MonacoEditorTestApp.Wasm/MonacoEditorTestApp.csproj" /> | ||||||||||||||||||||
| </Solution> | ||||||||||||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Spaces... it hurts me :-) But I understand it's a fork...