Skip to content

Commit

Permalink
Merge pull request #173 from BalassaMarton/move-shell-to-src
Browse files Browse the repository at this point in the history
Move the shell and node-launcher under src/
  • Loading branch information
BalassaMarton authored Mar 10, 2023
2 parents 145b100 + bcfa331 commit da2305c
Show file tree
Hide file tree
Showing 47 changed files with 192 additions and 167 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# Morgan Stanley makes this available to you under the Apache License, Version 2.0 (the "License"). You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. See the NOTICE file distributed with this work for additional information regarding copyright ownership. Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

##
## ComposeUI repo specific items
##
artifacts/

_site
.jekyll-metadata
[Oo]bj/
Expand Down
3 changes: 2 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="../Directory.Build.props" Condition="Exists('../Directory.Build.props')" />

<PropertyGroup>
<ComposeUIRepositoryRoot>$(MSBuildThisFileDirectory)</ComposeUIRepositoryRoot>
<ComposeUIRepositoryRoot>$(MSBuildThisFileDirectory.TrimEnd('/').TrimEnd('\'))</ComposeUIRepositoryRoot>
<PackageOutputPath>$(ComposeUIRepositoryRoot)/artifacts/packages/nuget</PackageOutputPath>
</PropertyGroup>
</Project>
38 changes: 0 additions & 38 deletions Tryouts/Prototypes/Shell/Node-launcher/MultiWindowDemo/index.html

This file was deleted.

24 changes: 0 additions & 24 deletions Tryouts/Prototypes/Shell/Node-launcher/MultiWindowDemo/popup.html

This file was deleted.

47 changes: 0 additions & 47 deletions Tryouts/Prototypes/Shell/Shell.csproj

This file was deleted.

1 change: 1 addition & 0 deletions Tryouts/serve-multiwindow-app.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cd..
npm i
npx lerna run build --stream
npx lerna run start --stream --scope "{@morgan-stanley/composeui-example-chart,@morgan-stanley/composeui-example-grid}"
Expand Down
15 changes: 15 additions & 0 deletions build/dotnet-pack.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
. "$PSScriptRoot/dotnet-common.ps1"

$failedSolutions = @()

foreach ($sln in GetSolutions) {
dotnet pack $sln --configuration Release --no-build

if ($LASTEXITCODE -ne 0 ) {
$failedSolutions += $sln
}
}

if ($failedSolutions.count -gt 0) {
throw "Build FAILED for solutions $failedSolutions"
}
118 changes: 75 additions & 43 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"private": true,
"workspaces": [
"src/messaging/js/*",
"src/shell/js/*",
"Tryouts/Plugins/ApplicationPlugins/*",
"Tryouts/Prototypes/Shell/Node-launcher/*"
],
Expand Down
File renamed without changes.
16 changes: 16 additions & 0 deletions src/shell/dotnet/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# ComposeUI Shell

This solution contains the ComposeUI shell for Windows.

# Usage


## Usage with `composeui-node-launcher`

The shell binaries must be globally accessible (ie. included in `PATH`) for `composeui-node-launcher` to work.

## Development setup

1. Build the solution
2. Run the `add-to-path.ps1` script to add the shell project's debug output directory to the user's PATH variable.
This step is necessary to make the shell available as a global command.
Loading

0 comments on commit da2305c

Please sign in to comment.