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.

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

Adding csproj formatting #858

Draft
wants to merge 28 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fec0970
Working on moving around tests
belav Mar 20, 2023
ee13114
Making some changes so that adding more file types is easier to test
belav Mar 20, 2023
85e1731
Refactoring towards multiple formatters
belav Mar 20, 2023
c617fe4
Updating ignore
belav Mar 20, 2023
b1fdc0f
Some cleanup
belav Mar 20, 2023
756b51f
Working on getting the generators happy with multiple directories
belav Mar 20, 2023
57395fd
Getting basics working
belav Mar 20, 2023
e72b76d
Adding csproj to playground. Switching to a sane state management pat…
belav Mar 27, 2023
5887f44
Trying to format with the CLI
belav Mar 27, 2023
30f05a4
fixing warnings
belav Mar 27, 2023
f5e8be4
Some notes and fixes
belav Mar 28, 2023
4a4c2a2
Adding some tests. Fixing <?xml being removed
belav Apr 17, 2023
e51834d
Getting the basics of printing Xml with Doc going
belav Apr 17, 2023
e61f38d
Merge branch 'main' into csproj-formatting
belav Apr 17, 2023
a8d1c64
Fixing thing
belav Apr 17, 2023
ebd2316
Getting attributes working better
belav Apr 17, 2023
f95ad65
some little cleanup
belav Apr 17, 2023
a913e77
Merge branch 'main' into csproj-formatting
belav Sep 15, 2024
14fa782
get playground partly working
belav Sep 15, 2024
21b7185
cleanup usings
belav Sep 15, 2024
a8ffa77
Getting things working with the changes that were in main
belav Sep 16, 2024
9367648
starting to pull in all the logic from how prettier prints html
belav Sep 17, 2024
25ce144
add note for looking into the xml plugin to see if it is easier
belav Sep 17, 2024
eaf396d
getting child elements partly working
belav Sep 22, 2024
d6ab600
kinda getting somewhere.... maybe
belav Sep 23, 2024
2f37675
now this is actually getting somewhat close
belav Sep 23, 2024
9eb07e0
actually getting close now
belav Sep 23, 2024
a99fd33
getting initial xml formatting done. settling on 2 spaces for default…
belav Sep 27, 2024
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
Prev Previous commit
Next Next commit
Adding csproj to playground. Switching to a sane state management pat…
…tern.
  • Loading branch information
belav committed Mar 27, 2023
commit e72b76db380ec909a100422edb1e5c681b45d7a1
30 changes: 15 additions & 15 deletions Src/CSharpier.Playground/CSharpier.Playground.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions"/>
<PackageReference Include="Serilog.Extensions.Logging.File"/>
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" />
<PackageReference Include="Serilog.Extensions.Logging.File" />
</ItemGroup>
<ItemGroup>
<!-- Don't publish the SPA source files, but do show them in the project files list -->
<Content Remove="$(SpaRoot)**"/>
<None Remove="$(SpaRoot)**"/>
<None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**"/>
<None Remove="App_Data\Uploads\**"/>
<Content Remove="App_Data\Uploads\**"/>
<Content Remove="$(SpaRoot)**" />
<None Remove="$(SpaRoot)**" />
<None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**" />
<None Remove="App_Data\Uploads\**" />
<Content Remove="App_Data\Uploads\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="App_Data\Uploads\**"/>
<Compile Remove="App_Data\Uploads\**" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="App_Data\Uploads\**"/>
<EmbeddedResource Remove="App_Data\Uploads\**" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CSharpier\CSharpier.csproj"/>
<ProjectReference Include="..\CSharpier\CSharpier.csproj" />
</ItemGroup>
<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
<Exec Command="node --version" ContinueOnError="true">
<Output TaskParameter="ExitCode" PropertyName="ErrorCode"/>
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
</Exec>
<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE."/>
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..."/>
<Exec WorkingDirectory="$(SpaRoot)" Command="npm install"/>
<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
</Target>
<Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
<ItemGroup>
<BuildFiles Include="$(SpaRoot)build\**"/>
<BuildFiles Include="$(SpaRoot)build\**" />
<ResolvedFileToPublish Include="@(BuildFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
<RelativePath>%(BuildFiles.Identity)</RelativePath>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
Expand Down
6 changes: 6 additions & 0 deletions Src/CSharpier.Playground/ClientApp/.idea/prettier.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions Src/CSharpier.Playground/ClientApp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Src/CSharpier.Playground/ClientApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"@types/react-router-dom": "5.1.7",
"@vitejs/plugin-react": "1.3.2",
"codemirror": "5.65.4",
"mobx": "6.9.0",
"mobx-react-lite": "4.0.2",
"prettier": "2.2.1",
"react": "16.14.0",
"react-codemirror2": "7.2.1",
Expand Down
13 changes: 10 additions & 3 deletions Src/CSharpier.Playground/ClientApp/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
import { AppContext, useSetupAppContext } from "./AppContext";
import React from "react";
import { Layout } from "./Layout";
import { AppState, AppStateContext } from "./AppContext";
import { configure } from "mobx";

const appState = new AppState();

configure({
enforceActions: "always",
});

export const App = () => {
return (
<AppContext.Provider value={useSetupAppContext()}>
<AppStateContext.Provider value={appState}>
<Layout />
</AppContext.Provider>
</AppStateContext.Provider>
);
};
Loading