diff --git a/.gitignore b/.gitignore index 0d8799969..2991f7e4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,14 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## +## Ignore Visual Studio temporary files, build results, and files generated by popular Visual Studio add-ons. ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore -# Artefacts +# Artefacts and build directories artefacts/ out/ +artifacts/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ # User-specific files *.rsuser @@ -13,8 +16,6 @@ out/ *.user *.userosscache *.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) *.userprefs # Build results @@ -26,17 +27,9 @@ x64/ x86/ [Aa][Rr][Mm]/ [Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -# Visual Studio 2015/2017 cache/options directory +# Visual Studio cache/options directory .vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files Generated\ Files/ # MSTest test Results @@ -58,7 +51,6 @@ BenchmarkDotNet.Artifacts/ # .NET Core project.lock.json project.fragment.lock.json -artifacts/ # StyleCop StyleCopReport.xml @@ -174,25 +166,18 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted *.pubxml *.publishproj -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted +# Microsoft Azure Web App publish settings PublishScripts/ # NuGet Packages *.nupkg -# The packages folder can be ignored because of Package Restore **/[Pp]ackages/* -# except build/, which is used as an MSBuild target. !**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files + +# NuGet v3's project.json files *.nuget.props *.nuget.targets @@ -212,9 +197,7 @@ _pkginfo.txt *.appx # Visual Studio cache files -# files ending in .cache can be ignored *.[Cc]ache -# but keep track of directories ending in .cache !?*.[Cc]ache/ # Others @@ -229,19 +212,12 @@ ClientBin/ orleans.codegen.cs # Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ +# *.snk # RIA/Silverlight projects Generated_Code/ -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) +# Backup & report files from project upgrades _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML @@ -277,7 +253,7 @@ node_modules/ # Visual Studio 6 workspace options file *.opt -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +# Visual Studio 6 auto-generated workspace file *.vbw # Visual Studio LightSwitch build output @@ -306,7 +282,7 @@ paket-files/ __pycache__/ *.pyc -# Cake - Uncomment if you are using it +# Cake # tools/** # !tools/packages.config @@ -342,50 +318,10 @@ ASALocalRun/ # BeatPulse healthcheck temp database healthchecksdb -/Grapevine/Client/PathParams.cs -/Grapevine/Client/QueryString.cs -/Grapevine/Client/RestClient.cs -/Grapevine/Client/RestRequest.cs -/Grapevine/Client/RestResponse.cs -/Grapevine/Exceptions/Client/ClientStateException.cs -/Grapevine/Exceptions/Server/DynamicValueNotFoundException.cs -/Grapevine/Exceptions/Server/InvalidRouteMethodException.cs -/Grapevine/Exceptions/Server/NotFoundException.cs -/Grapevine/Exceptions/Server/ServerStateException.cs -/Grapevine/Exceptions/Server/UnableToStartHostException.cs -/Grapevine/Exceptions/Server/UnableToStopHostException.cs -/Grapevine/Grapevine.csproj -/Grapevine/Interfaces/Server/HttpContext.cs -/Grapevine/Interfaces/Server/HttpRequest.cs -/Grapevine/Interfaces/Server/HttpResponse.cs -/Grapevine/Interfaces/Server/IHttpListener.cs -/Grapevine/Interfaces/Server/IHttpListenerContext.cs -/Grapevine/Interfaces/Shared/IGrapevineLogger.cs -/Grapevine/Server/Attributes/RestResource.cs -/Grapevine/Server/Attributes/RestRoute.cs -/Grapevine/Server/HttpResponseExtensions.cs -/Grapevine/Server/PublicFolder.cs -/Grapevine/Server/RestCluster.cs -/Grapevine/Server/RestServer.cs -/Grapevine/Server/Route.cs -/Grapevine/Server/RouteScanner.cs -/Grapevine/Server/Router.cs -/Grapevine/Server/ServerSettings.cs -/Grapevine/Shared/ContentType.cs -/Grapevine/Shared/DynamicProperties.cs -/Grapevine/Shared/HttpMethod.cs -/Grapevine/Shared/HttpStatusCode.cs -/Grapevine/Shared/InternalExtensions.cs -/Grapevine/Shared/Loggers/ConsoleLogger.cs -/Grapevine/Shared/Loggers/InMemoryLogger.cs -/Grapevine/Shared/Loggers/LoggerExtensions.cs -/Grapevine/Shared/Loggers/NullLogger.cs -/Grapevine/Shared/NameValueCollectionExtensions.cs -/Grapevine/Shared/ParamParser.cs -/Grapevine/Shared/PortFinder.cs -/Grapevine/Shared/StreamExtensions.cs -/Grapevine/Shared/UriScheme.cs -/Grapevine/Shared/UriSchemeExtensions.cs + +# Grapevine content +Grapevine/* + +# Custom ignores /src/AasxServerStandardBib/AdminShell.cs.old -/src/AasxServerBlazor/temp.aasx -/src/AasxServerBlazor/Properties/launchSettings.json +/src/AasxServerBlazor/temp.aasx \ No newline at end of file diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 23053de09..000000000 --- a/src/.gitignore +++ /dev/null @@ -1 +0,0 @@ -packages/ diff --git a/src/AasxServer.sln b/src/AasxServer.sln index 17a62daea..c0cdb4a02 100644 --- a/src/AasxServer.sln +++ b/src/AasxServer.sln @@ -7,12 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AasxServerStandardBib", "Aa EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B8C116C4-932B-4071-9DCC-D4F64E3C4E6F}" ProjectSection(SolutionItems) = preProject - .gitignore = .gitignore ..\CHANGELOG.md = ..\CHANGELOG.md ..\README.md = ..\README.md ..\CONTRIBUTING.md = ..\CONTRIBUTING.md ..\LICENSE.TXT = ..\LICENSE.TXT ..\CONTRIBUTORS.md = ..\CONTRIBUTORS.md + ..\.gitignore = ..\.gitignore EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jsoncanonicalizer", "jsoncanonicalizer\jsoncanonicalizer.csproj", "{A420D3A9-3725-4F4D-9185-2957F2F9F0A9}" diff --git a/src/AasxServerBlazor/Properties/launchSettings.json b/src/AasxServerBlazor/Properties/launchSettings.json new file mode 100644 index 000000000..a98906cea --- /dev/null +++ b/src/AasxServerBlazor/Properties/launchSettings.json @@ -0,0 +1,32 @@ +{ + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "commandLineArgs": "--port 51710 --data-path C:\\Develop\\Aasx\\repo --edit --secret-string=123", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "AasxServerBlazor": { + "commandName": "Project", + "commandLineArgs": "--no-security --secret-string-api 1234 --aasx-in-memory 1000 --data-path \"C:\\Development\" --edit --external-blazor http://localhost:5001", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "AASREGISTRY": "https://registry.dpp40-2-v2.industrialdigitaltwin.org", + "IFRAMEPATH": "https://dpp40-2-v2.industrialdigitaltwin.org/dashboard/submodelViewV3.html" + }, + "applicationUrl": "http://localhost:5001", + "jsWebView2Debugging": true + } + }, + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:56189", + "sslPort": 0 + } + } +} \ No newline at end of file