diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9128b4e..62c6e67f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build BruTile +name: Build on Windows on: push: @@ -12,9 +12,9 @@ jobs: build: env: - SOLUTION: 'BruTile-Build.sln' + SOLUTION: 'BruTile.sln' - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index be133061..d437a5fa 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -15,9 +15,9 @@ jobs: build: env: - SOLUTION: 'BruTile-Build.sln' + SOLUTION: 'BruTile.sln' - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: actions/checkout@v3 @@ -34,11 +34,18 @@ jobs: dotnet-version: 6.0.402 - name: Build - run: dotnet build $SOLUTION --configuration Release -p:Version=${{ inputs.release_version }} --no-restore + run: dotnet build $SOLUTION --configuration Release -p:Version=${{ inputs.release_version }} --no-restore /p:PackageOutputPath="${GITHUB_WORKSPACE}/nugets" - name: Test - run: dotnet test $SOLUTION --configuration Release --no-restore --verbosity normal - + run: dotnet test $SOLUTION --configuration Release --no-restore --verbosity normal -p:Version=${{ inputs.release_version }} + + #- name: Tag + # if: ${{ inputs.release_nuget }} + # run: | + # git tag ${{ inputs.release_version }} + # git push --tags + - name: Publish if: ${{ inputs.release_nuget }} - run: nuget push **\*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGET_APIKEY}} \ No newline at end of file + run: | + nuget push "${GITHUB_WORKSPACE}\nugets\**\*.nupkg" -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGET_APIKEY}} \ No newline at end of file diff --git a/BruTile-Build.sln b/BruTile-Build.sln deleted file mode 100644 index 6d6267be..00000000 --- a/BruTile-Build.sln +++ /dev/null @@ -1,127 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.4.33110.190 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D70B7185-B90D-4CB7-8FDB-441FADD9821D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BruTile", "BruTile\BruTile.csproj", "{5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BruTile.MbTiles", "BruTile.MbTiles\BruTile.MbTiles.csproj", "{CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance", "Performance", "{FC9F55A8-498E-4FFE-9127-E8CB7725DC9D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BruTile.Performance.Desktop", "Performance\BruTile.Performance.Desktop\BruTile.Performance.Desktop.csproj", "{F1C36376-58EE-457F-A2A2-ADE35A39FC8D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BruTile.Tests", "Tests\BruTile.Tests\BruTile.Tests.csproj", "{65B03D41-85CD-492C-99F9-4CD545651A3A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BruTile.MbTiles.Tests", "Tests\BruTile.MbTiles.Tests\BruTile.MbTiles.Tests.csproj", "{1A6D2993-C380-4DF4-9952-A9F22FFD34EB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{B8BB928A-6C12-45B0-8B4C-DF76F5A2D32B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BruTile.GettingStarted", "Samples\BruTile.GettingStarted\BruTile.GettingStarted.csproj", "{5A72F57F-4213-4D85-9970-84C942F2B2A8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "General", "General", "{489AE2DA-3A35-4B4F-AB95-7E2B193D0833}" - ProjectSection(SolutionItems) = preProject - BruTile.Common.props = BruTile.Common.props - .github\workflows\build.yml = .github\workflows\build.yml - Directory.Build.props = Directory.Build.props - .github\workflows\publish-nuget.yml = .github\workflows\publish-nuget.yml - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Debug|x64.ActiveCfg = Debug|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Debug|x64.Build.0 = Debug|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Debug|x86.ActiveCfg = Debug|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Debug|x86.Build.0 = Debug|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Release|Any CPU.Build.0 = Release|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Release|x64.ActiveCfg = Release|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Release|x64.Build.0 = Release|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Release|x86.ActiveCfg = Release|Any CPU - {5C51D3BB-9DD0-4945-A808-8DCA6F3761C6}.Release|x86.Build.0 = Release|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Debug|x64.ActiveCfg = Debug|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Debug|x64.Build.0 = Debug|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Debug|x86.ActiveCfg = Debug|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Debug|x86.Build.0 = Debug|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Release|Any CPU.Build.0 = Release|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Release|x64.ActiveCfg = Release|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Release|x64.Build.0 = Release|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Release|x86.ActiveCfg = Release|Any CPU - {CFD89526-A4FB-4C52-A8D6-7F59A0E3EF7F}.Release|x86.Build.0 = Release|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Debug|x64.ActiveCfg = Debug|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Debug|x64.Build.0 = Debug|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Debug|x86.ActiveCfg = Debug|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Debug|x86.Build.0 = Debug|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Release|Any CPU.Build.0 = Release|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Release|x64.ActiveCfg = Release|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Release|x64.Build.0 = Release|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Release|x86.ActiveCfg = Release|Any CPU - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D}.Release|x86.Build.0 = Release|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Debug|x64.ActiveCfg = Debug|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Debug|x64.Build.0 = Debug|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Debug|x86.ActiveCfg = Debug|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Debug|x86.Build.0 = Debug|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Release|Any CPU.Build.0 = Release|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Release|x64.ActiveCfg = Release|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Release|x64.Build.0 = Release|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Release|x86.ActiveCfg = Release|Any CPU - {65B03D41-85CD-492C-99F9-4CD545651A3A}.Release|x86.Build.0 = Release|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Debug|x64.ActiveCfg = Debug|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Debug|x64.Build.0 = Debug|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Debug|x86.ActiveCfg = Debug|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Debug|x86.Build.0 = Debug|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Release|Any CPU.Build.0 = Release|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Release|x64.ActiveCfg = Release|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Release|x64.Build.0 = Release|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Release|x86.ActiveCfg = Release|Any CPU - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB}.Release|x86.Build.0 = Release|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Debug|x64.ActiveCfg = Debug|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Debug|x64.Build.0 = Debug|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Debug|x86.ActiveCfg = Debug|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Debug|x86.Build.0 = Debug|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Release|Any CPU.Build.0 = Release|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Release|x64.ActiveCfg = Release|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Release|x64.Build.0 = Release|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Release|x86.ActiveCfg = Release|Any CPU - {5A72F57F-4213-4D85-9970-84C942F2B2A8}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {F1C36376-58EE-457F-A2A2-ADE35A39FC8D} = {FC9F55A8-498E-4FFE-9127-E8CB7725DC9D} - {65B03D41-85CD-492C-99F9-4CD545651A3A} = {D70B7185-B90D-4CB7-8FDB-441FADD9821D} - {1A6D2993-C380-4DF4-9952-A9F22FFD34EB} = {D70B7185-B90D-4CB7-8FDB-441FADD9821D} - {5A72F57F-4213-4D85-9970-84C942F2B2A8} = {B8BB928A-6C12-45B0-8B4C-DF76F5A2D32B} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {B183B66E-60DD-4958-AC91-81285E29B11D} - EndGlobalSection -EndGlobal diff --git a/BruTile.sln b/BruTile.sln index ecd5b5cb..4e726274 100644 --- a/BruTile.sln +++ b/BruTile.sln @@ -6,11 +6,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00_Common", "00_Common", "{ ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig .gitignore = .gitignore - BruTile.sln.DotSettings = BruTile.sln.DotSettings .github\workflows\build.yml = .github\workflows\build.yml Directory.Build.props = Directory.Build.props license.txt = license.txt - NuGet.config = NuGet.config .github\workflows\publish-nuget.yml = .github\workflows\publish-nuget.yml README.md = README.md EndProjectSection @@ -37,18 +35,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BruTile.MbTiles", "BruTile. EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01_Source", "01_Source", "{19780978-0590-4DCF-85A6-5D2941A1085C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05_Build", "05_Build", "{B583AE04-DFDB-4232-9888-2FEDA348165F}" - ProjectSection(SolutionItems) = preProject - Build\deploy.cmd = Build\deploy.cmd - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BruTile.GettingStarted", "Samples\BruTile.GettingStarted\BruTile.GettingStarted.csproj", "{ACB6A591-8735-4BB1-B8DC-4FBA65C4D722}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BruTile.Samples.MbTiles", "Samples\BruTile.Samples.MbTiles\BruTile.Samples.MbTiles.csproj", "{B7B95174-F996-45F5-9CC3-8FB245F52A3D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BruTile.Demo", "Samples\BruTile.Demo\BruTile.Demo.csproj", "{2B4CD5F9-D17E-4EA4-8E6F-E16CF02773A6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "06_Tools", "06_Tools", "{9891074D-9B27-48FD-B6E6-F80CEF3EA286}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05_Tools", "05_Tools", "{9891074D-9B27-48FD-B6E6-F80CEF3EA286}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EpsgAccessDatabaseTests", "Tools\EpsgAccessDatabaseTests\EpsgAccessDatabaseTests.csproj", "{B227C1F9-77CA-496D-B100-89D75FCBF0AA}" EndProject diff --git a/BruTile.sln.DotSettings b/BruTile.sln.DotSettings deleted file mode 100644 index 3b056018..00000000 --- a/BruTile.sln.DotSettings +++ /dev/null @@ -1,58 +0,0 @@ - - True - ExplicitlyExcluded - ExplicitlyExcluded - VISIBLE_FILES - HINT - - <?xml version="1.0" encoding="utf-16"?><Profile name="ReorderTypeMembers"><CSReorderTypeMembers>True</CSReorderTypeMembers></Profile> - True - Default: Reformat Code - - // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information. - - BKG - CRS - DCP - EPSG - GIS - JSON - OSM - SQ - SRS - TK - TMS - URL - WMS - XY - <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /> - True - True - 2 - True - <data /> - <data><IncludeFilters /><ExcludeFilters /></data> - False - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True \ No newline at end of file diff --git a/BruTile/BruTile.csproj b/BruTile/BruTile.csproj index f3c25ab9..bdae5c1b 100644 --- a/BruTile/BruTile.csproj +++ b/BruTile/BruTile.csproj @@ -4,6 +4,7 @@ netstandard2.0;net6.0 true + BruTile is a C# library for GIS tile services such as those of Bing maps and OpenStreetMap tiling gis osm geo diff --git a/Build/deploy.cmd b/Build/deploy.cmd deleted file mode 100644 index c09a6e42..00000000 --- a/Build/deploy.cmd +++ /dev/null @@ -1,17 +0,0 @@ -REM edit BruTile.Common.props to set the wanted version -REM Put the sln in Release mode and rebuild all. The version is retrieved from the Release version of BruTile.dll -REM call this script without arguments from the sln folder. -call dotnet build Tools\GetVersionFromAssembly\GetVersionFromAssembly.csproj /property:Configuration=Release -REM todo: Call run on the csproj. That is possible nowadays. -for /f "delims=" %%i in ('dotnet Tools\GetVersionFromAssembly\bin\Release\netcoreapp3.1\GetVersionFromAssembly.dll .\Release\netstandard2.0\BruTile.dll') do set VERSION=%%i -ECHO VERSION is: %VERSION% - -msbuild brutile.sln /property:Configuration=Release - -nuget push .\Release\brutile.%VERSION%.nupkg -source nuget.org -nuget push .\Release\brutile.mbtiles.%VERSION%.nupkg -source nuget.org -git commit -m %VERSION% -a -git tag %VERSION% -git push origin %VERSION% -git push - diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e582ecc3..00000000 --- a/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -FROM jupyter/scipy-notebook:latest - -# Install .NET CLI dependencies - -ARG NB_USER=jovyan -ARG NB_UID=1000 -ENV USER ${NB_USER} -ENV NB_UID ${NB_UID} -ENV HOME /home/${NB_USER} - -WORKDIR ${HOME} - -USER root -RUN apt-get update -RUN apt-get install -y curl - -# Install .NET CLI dependencies -RUN apt-get install -y --no-install-recommends \ - libc6 \ - libgcc1 \ - libgssapi-krb5-2 \ - libicu60 \ - libssl1.1 \ - libstdc++6 \ - zlib1g - -RUN rm -rf /var/lib/apt/lists/* - -# Install .NET Core SDK -ENV DOTNET_SDK_VERSION 3.0.100 - -RUN curl -SL --output dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz \ - && dotnet_sha512='766da31f9a0bcfbf0f12c91ea68354eb509ac2111879d55b656f19299c6ea1c005d31460dac7c2a4ef82b3edfea30232c82ba301fb52c0ff268d3e3a1b73d8f7' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ - && rm dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet - -# Enable detection of running in a container -ENV DOTNET_RUNNING_IN_CONTAINER=true \ - # Enable correct mode for dotnet watch (only mode supported in a container) - DOTNET_USE_POLLING_FILE_WATCHER=true \ - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip \ - # Opt out of telemetry until after we install jupyter when building the image, this prevents caching of machine id - DOTNET_TRY_CLI_TELEMETRY_OPTOUT=true - -# Trigger first run experience by running arbitrary cmd -RUN dotnet help - -# Copy notebooks - -COPY ./notebooks/ ${HOME}/notebooks/ - -# Copy package sources - -COPY ./NuGet.config ${HOME}/nuget.config - -RUN chown -R ${NB_UID} ${HOME} -USER ${USER} - -# Install lastest build from master branch of Microsoft.DotNet.Interactive from myget -RUN dotnet tool install -g dotnet-try --add-source "https://dotnet.myget.org/F/dotnet-try/api/v3/index.json" - -# Or install latest Microsoft.DotNet.Interactive from nuget -# RUN dotnet tool install -g dotnet-try - - -ENV PATH="${PATH}:${HOME}/.dotnet/tools" -RUN echo "$PATH" - -# Install kernel specs -RUN dotnet try jupyter install - -# Enable telemetry once we install jupyter for the image -ENV DOTNET_TRY_CLI_TELEMETRY_OPTOUT=false - -# Set root to notebooks -WORKDIR ${HOME}/notebooks/ \ No newline at end of file diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index a5f61976..00000000 --- a/NuGet.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/README.md b/README.md index 178150e5..4990a0cf 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ | | Status | | ------------- |:-------------:| -| Build | [![Build status](https://ci.appveyor.com/api/projects/status/5s4poobpfab9g8ny?svg=true)](https://ci.appveyor.com/project/pauldendulk/brutile) | +| Build | [![Build status](https://github.com/brutile/brutile/actions/workflows/build.yml/badge.svg)](https://github.com/BruTile/BruTile/actions/workflows/build.yml?query=branch%3Amaster) | | NuGet | [![NuGet Status](http://img.shields.io/nuget/v/BruTile.svg?style=flat)](https://www.nuget.org/packages/BruTile/) | ### BruTile -BruTile is a .NET Standard 1.1 library to access tile services like OpenStreetMap and Bing. Such tile services store pre-rendered tiles for a certain area and for various levels of detail. BruTile helps to determine which tiles to fetch for a certain viewport of a map. +BruTile is a .NET Standard 2.0 library to access tile services like OpenStreetMap and Bing. Such tile services store pre-rendered tiles for a certain area and for various levels of detail. BruTile helps to determine which tiles to fetch for a certain viewport of a map. BruTile returns tiles as raw image streams and has no dependency on a specific client platform. BruTile does not display those tiles. You need to use a mapping library like SharpMap, ArcBruTile or [Mapsui](https://github.com/Mapsui/Mapsui) or write your own code to display tiles. What BruTile does is: @@ -25,24 +25,11 @@ What BruTile does is: - Support for .NET Framework 4.5 has been removed (also the samples and tests have moved to .NET Core). - BruTile.Desktop and BruTile.Desktop.DbCache have been deleted and their content has moved to the BruTile nuget. -**BruTile V3** supports .NET Standard. The Profiles by NuGet package: - -| Library | Targeted Framework | -| ------------------------ | --------------------- | -| BruTile | .NET Standard 1.1 | -| BruTile.MbTiles | .NET Standard 1.1 | -| BruTile.Desktop | .NET Standard 1.6 | -| BruTile.Desktop.DbCache | .NET Standard 2.0 | - -All the above libraries additionally target .Net Framework 4.5 - ### Demo For a demo showing various data sources download the source code and run BruTile.Demo in the Samples folder ## Getting Started -[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/bertt/brutile/patch-1) - ### 1) Create an app and add the BruTile NuGet package Create a .NET Console app in Visual Studio. The the BruTile NuGet package. Use the package manager tools in Visual Studio or add it from the package manager console: ``` diff --git a/Tools/EpsgAccessDatabaseTests/CrsAxisOrderRegistryTest.cs b/Tools/EpsgAccessDatabaseTests/CrsAxisOrderRegistryTest.cs index 200ca7ce..fbc36599 100644 --- a/Tools/EpsgAccessDatabaseTests/CrsAxisOrderRegistryTest.cs +++ b/Tools/EpsgAccessDatabaseTests/CrsAxisOrderRegistryTest.cs @@ -152,7 +152,7 @@ public void TestAxisOrder() if (CrsIdentifier.TryParse("urn:ogc:def:crs:EPSG::" + code, out var crs)) { var expected = unusual.Contains(code) ? 1 : 0; - Assert.AreEqual(expected, crsAxisOrderRegistry[crs][0]); + Assert.That(crsAxisOrderRegistry[crs][0], Is.EqualTo(expected)); } } } diff --git a/Tools/EpsgAccessDatabaseTests/CrsUnitOfMeasureRegistryTest.cs b/Tools/EpsgAccessDatabaseTests/CrsUnitOfMeasureRegistryTest.cs index 7d1200ec..352a3cac 100644 --- a/Tools/EpsgAccessDatabaseTests/CrsUnitOfMeasureRegistryTest.cs +++ b/Tools/EpsgAccessDatabaseTests/CrsUnitOfMeasureRegistryTest.cs @@ -151,9 +151,9 @@ public void TestEpsgCodeUom() var uomCode = dr.GetInt32(1); if (uomCode == 9001 || uomCode == 1024) - Assert.AreEqual(1d, uom.ToMeter, "Unit of measure ToMeter is not 1d: {0}", crs); + Assert.That(uom.ToMeter, Is.EqualTo(1d), "Unit of measure ToMeter is not 1d: {0}", crs); else - Assert.AreNotEqual(1d, uom.ToMeter, "Unit of measure ToMeter should not be 1d: {0}", crs); + Assert.That(uom.ToMeter, Is.Not.EqualTo(1d), "Unit of measure ToMeter should not be 1d: {0}", crs); } } }