diff --git a/.NETCoreApp,Version=v3.0.AssemblyAttributes.cs b/.NETCoreApp,Version=v3.0.AssemblyAttributes.cs new file mode 100644 index 0000000..e7801f1 --- /dev/null +++ b/.NETCoreApp,Version=v3.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v3.0", FrameworkDisplayName = "")] diff --git a/.travis.yml b/.travis.yml index 1b84466..de3f93f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ mono: none script: - sudo snap alias dotnet-sdk.dotnet dotnet - dotnet build --configuration Release - - dotnet test ./CompilerTests + - dotnet test before_deploy: - NAME=$(git describe --tag --abbrev=0) - bash ./release.sh $NAME $ZDragon_GitHub_Token diff --git a/ApplicationTests/BaseApplicationTest.cs b/ApplicationTests/BaseApplicationTest.cs index 5ece634..f173082 100644 --- a/ApplicationTests/BaseApplicationTest.cs +++ b/ApplicationTests/BaseApplicationTest.cs @@ -29,7 +29,14 @@ public BaseFileWatcherTest(ITestOutputHelper _output, string _dir) public void Dispose() { project.Dispose(); - Directory.Delete(dir, true); + try + { + Directory.Delete(dir, true); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } Console.WriteLine("CLEANUP: " + dir); } diff --git a/CLI/CLI.csproj b/CLI/CLI.csproj index 897515c..58b5caf 100644 --- a/CLI/CLI.csproj +++ b/CLI/CLI.csproj @@ -42,7 +42,6 @@ - PreserveNewest PreserveNewest diff --git a/CLI/wwwroot/build/bundle.css b/CLI/wwwroot/build/bundle.css index 1af4c9d..52ba88f 100644 --- a/CLI/wwwroot/build/bundle.css +++ b/CLI/wwwroot/build/bundle.css @@ -1,12 +1,12 @@ main.svelte-1kds1eb{text-align:center;padding:1em;max-width:240px;margin:0 auto}@media(min-width: 640px){main.svelte-1kds1eb{max-width:none}} .result-list.svelte-jpwv5m{overflow:auto;height:400px} tr.svelte-1aug0lv:hover{cursor:pointer} -.errors.svelte-1l9twu{position:fixed;right:1rem;top:6rem}.error.svelte-1l9twu{min-width:300px;max-width:700px}.error.svelte-1l9twu pre.svelte-1l9twu{overflow-wrap:break-word}.editor-container.svelte-1l9twu{margin-top:1rem}.editor-container.svelte-1l9twu,#editor.svelte-1l9twu{height:calc(100% - 4rem)} textarea.svelte-nhavks{width:750px;min-height:250px} -.preview.svelte-1crxzpc{height:calc(100% - 60px)}iframe.svelte-1crxzpc{width:100%;height:100%;border:none} +.errors.svelte-1l9twu{position:fixed;right:1rem;top:6rem}.error.svelte-1l9twu{min-width:300px;max-width:700px}.error.svelte-1l9twu pre.svelte-1l9twu{overflow-wrap:break-word}.editor-container.svelte-1l9twu{margin-top:1rem}.editor-container.svelte-1l9twu,#editor.svelte-1l9twu{height:calc(100% - 4rem)} .topology.svelte-sq8u03{height:calc(100% - 4rem)}#topology.svelte-sq8u03{height:100%}#topology>.svelte-sq8u03:focus{outline:none !important}.options-form.svelte-sq8u03{position:fixed;right:10px;bottom:10px} -.descriptor.svelte-1jlx0wv{border:1px solid lightgray;font-size:14px;padding:1;margin:0;width:450px;margin-bottom:1rem;margin-left:50%;transform:translateX(-50%);background:white}.descriptor.svelte-1jlx0wv:hover{cursor:pointer}.descriptor.svelte-1jlx0wv h2.svelte-1jlx0wv{background:#3083db;color:white;padding:0.5em;font-size:1em;margin:0;position:relative}.descriptor.svelte-1jlx0wv .description.svelte-1jlx0wv{color:gray;padding:0 1rem}.pill.svelte-1jlx0wv{background:orange;border:1 px solid rgb(172, 114, 6);color:white;border-radius:50%;font-size:10px;text-transform:lowercase;padding:0.5em 1em 0.6em 1em;position:absolute;left:10px;top:50%;transform:translateY(-50%)}.pill.type.svelte-1jlx0wv{background:purple}.pill.field.svelte-1jlx0wv{background:darkgreen} +.preview.svelte-1crxzpc{height:calc(100% - 60px)}iframe.svelte-1crxzpc{width:100%;height:100%;border:none} ul.svelte-wjec8i{list-style:none;text-align:left} +.descriptor.svelte-1jlx0wv{border:1px solid lightgray;font-size:14px;padding:1;margin:0;width:450px;margin-bottom:1rem;margin-left:50%;transform:translateX(-50%);background:white}.descriptor.svelte-1jlx0wv:hover{cursor:pointer}.descriptor.svelte-1jlx0wv h2.svelte-1jlx0wv{background:#3083db;color:white;padding:0.5em;font-size:1em;margin:0;position:relative}.descriptor.svelte-1jlx0wv .description.svelte-1jlx0wv{color:gray;padding:0 1rem}.pill.svelte-1jlx0wv{background:orange;border:1 px solid rgb(172, 114, 6);color:white;border-radius:50%;font-size:10px;text-transform:lowercase;padding:0.5em 1em 0.6em 1em;position:absolute;left:10px;top:50%;transform:translateY(-50%)}.pill.type.svelte-1jlx0wv{background:purple}.pill.field.svelte-1jlx0wv{background:darkgreen} .overlay.svelte-yjqhyw{position:fixed;top:0;left:0;right:0;bottom:0;height:100%;width:100%;background:rgba(0, 0, 0, 0.4);visibility:hidden}.overlay.show.svelte-yjqhyw{visibility:visible}.overlay.svelte-yjqhyw .window.svelte-yjqhyw{background:#313338;border:1px solid 616265;border-radius:5px;position:absolute;top:10%;width:300px;left:50%;transform:translateX(-50%);font-size:2em;color:white} /*# sourceMappingURL=bundle.css.map */ \ No newline at end of file diff --git a/CLI/wwwroot/build/bundle.css.map b/CLI/wwwroot/build/bundle.css.map index f5431d2..b6211f4 100644 --- a/CLI/wwwroot/build/bundle.css.map +++ b/CLI/wwwroot/build/bundle.css.map @@ -5,26 +5,26 @@ "../../../web/src/App.svelte", "../../../web/src/Home.svelte", "../../../web/src/Lexicon.svelte", - "../../../web/src/Editor.svelte", "../../../web/src/LexiconAdmin.svelte", - "../../../web/src/Preview.svelte", + "../../../web/src/Editor.svelte", "../../../web/src/ModuleTopology.svelte", - "../../../web/src/SearchResult.svelte", + "../../../web/src/Preview.svelte", "../../../web/src/FileTree.svelte", + "../../../web/src/SearchResult.svelte", "../../../web/src/Controls/Overlay.svelte" ], "sourcesContent": [ "\n\n\n\n
\n\n navigator.navigate('index')}>\n Home\n \n navigator.navigate('module-topology')}>\n Topology\n \n navigator.navigate('lexicon')}>\n Lexicon\n \n {#if navigator.module}\n navigator.navigate('editor')}>\n Editor\n \n navigator.navigate('preview')}>\n Preview\n \n {/if}\n
\n\n{#if route === 'index'}\n \n{:else if route === 'lexicon'}\n \n{:else if route === 'add-lexicon'}\n \n{:else if route === 'edit-lexicon'}\n \n{:else if route === 'lexicon-admin'}\n \n{:else if route === 'preview'}\n \n{:else if route === 'editor'}\n \n{:else if route === 'config'}\n \n{:else if route === 'module-topology'}\n \n{:else if route === 'module-create'}\n \n{:else}\n \n{/if}\n", "\n\n\n\n
\n
\n

Welcome to ZDragon!

\n\n
\n

Search your models:

\n \n
\n\n
\n {#if data && data.length > 0}\n {#each data as d}\n \n {/each}\n {:else}\n
Your query returned no results.
\n {/if}\n
\n
\n\n", "\n\n\n\n
\n

Search your lexicon!

\n
\n {\n navigator.navigate('add-lexicon');\n }}>\n Create\n \n

Search your lexicon:

\n e.code === 'Enter' && onkeyup(e.target.value)}\n on:change={e => findData(e.target.value)} />\n
\n
\n\n \n \n \n \n \n \n {#each data as d}\n navigator.navigate('edit-lexicon', d.id)}>\n \n \n \n \n {/each}\n \n
DomainNameDescription
{d.domain}{d.name}{d.description}
\n", - "\n\n\n\n
\n Save\n
\n
\n
\n
\n\n{#if errors && errors.length > 0}\n
\n {#each errors as error}\n
\n
{error.title}
\n
{error.message}
\n
\n {/each}\n
\n{/if}\n\n", "\n\n\n\n

Domains

\n

Please give the domains you would like to restrict your lexicon to.

\n