Skip to content

Commit

Permalink
Merge branch 'master' into RFD900ToolsForPullRequest
Browse files Browse the repository at this point in the history
  • Loading branch information
meee1 authored May 3, 2020
2 parents 3ed2892 + 34eb350 commit 2f6c1d7
Show file tree
Hide file tree
Showing 6,593 changed files with 1,605,920 additions and 266,062 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
34 changes: 34 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[*.cs]

# CA1707: Identifiers should not contain underscores
dotnet_diagnostic.CA1707.severity = suggestion

# CA2211: Non-constant fields should not be visible
dotnet_diagnostic.CA2211.severity = suggestion

# CA1062: Validate arguments of public methods
dotnet_diagnostic.CA1062.severity = suggestion

# CA1303: Do not pass literals as localized parameters
dotnet_diagnostic.CA1303.severity = suggestion

# CA1305: Specify IFormatProvider
dotnet_diagnostic.CA1305.severity = suggestion

# CA1031: Do not catch general exception types
dotnet_diagnostic.CA1031.severity = suggestion

# CA1304: Specify CultureInfo
dotnet_diagnostic.CA1304.severity = suggestion

# CA1051: Do not declare visible instance fields
dotnet_diagnostic.CA1051.severity = silent

# CA1712: Do not prefix enum values with type name
dotnet_diagnostic.CA1712.severity = silent

# CA1307: Specify StringComparison
dotnet_diagnostic.CA1307.severity = suggestion

# CA1815: Override equals and operator equals on value types
dotnet_diagnostic.CA1815.severity = silent
29 changes: 29 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: GitHub CI
on: push

jobs:
build:
name: Build
runs-on: windows-latest

steps:
- uses: actions/checkout@v1

- name: Build
shell: pwsh
run: |
$msbuildPath = Split-Path (& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild\Current\Bin\amd64\MSBuild.exe | Select-Object -First 1) -Parent
$env:PATH = $msbuildPath + ';' + $env:PATH
msbuild -v:m -restore -t:Build -p:Configuration=Release MissionPlanner.sln
- name: Cleanup
shell: pwsh
run: |
cd bin\Release\net461
gci plugins | ForEach-Object { if (Test-Path $_.Name -PathType Leaf) { Write-Host "Remove" $_.FullName ; Remove-Item $_.FullName } else { Write-Host $_.Name } }
- uses: actions/upload-artifact@v1
with:
name: MissionPlannerBeta
path: bin\Release\net461

90 changes: 26 additions & 64 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,64 +1,26 @@
*.pfx
*.suo
*.user
bin/
obj/
/CustomImages
/APMPlannerXplanes/APMPlannerXplanes/Debug
/APMPlannerXplanes/Debug
/Driver/makecert.exe
/Drivers/gencert.bat
/Drivers/int2cat.bat
/Drivers/makecert.exe
/Drivers/signing.url
/Msi
/packages
*.psess
/copy.bat
/macos.bat
/logo.png
*.vsp
/sitl
/cov-int
*.pyc
*.ncrunchproject
*.crunchsolution.cache
*.ncrunchsolution
/Plugins/AltitudeAngelWings/AltitudeAngelWings/Keys.config
/ExtLibs/Mavlink/Mavlink.cs
/ExtLibs/Mavlink/mavlink
/LogAnalyzer/LogAnalyzer.zip
/LogAnalyzer/py2exe/dist
/LogAnalyzer/py2exe/build
/LogAnalyzer/LogAnalyzer64.zip
/gstream
/MissionPlanner.appx
/AltitudeAngelWings.sln
/appxkey.cer
/ExtLibs/Portable/Portable
/ExtLibs/AltitudeAngelWings/Keys.config
/MissionPlannerBeta.zip
*.vspx
/ExtLibs/Android
/ExtLibs/w3w
/ExtLibs/java
/ExtLibs/netcore
/.vs
/ExtLibs/Zeroconf
RFD900ToolsSetup/Debug/RFD900ModelToolsSetup.msi
/ExtLibs/GMap.NET.Core/GMap.NET.Core2.csproj
/ExtLibs/GDAL/GDAL2.csproj
/ExtLibs/Core/Core2.csproj
/ExtLibs/Comms/MissionPlanner.Comms2.csproj
/ExtLibs/BaseClasses/BaseClasses2.csproj
/ExtLibs/AviFile/AviFile2.csproj
/ExtLibs/Arduino/Arduino2.csproj
/ExtLibs/GeoUtility/GeoUtility2.csproj
/MissionPlanner2.csproj
/ExtLibs/Mavlink/MAVLink2.csproj
/ExtLibs/Utilities/MissionPlanner.Utilities2.csproj
/Plugins/Shortcuts
/test
/ExtLibs/GDAL/Native/gdal
/ExtLibs/SimpleExample/packages
/ExtLibs/SimpleExample/.vs
*.pfx
*.suo
*.user
bin/
obj/
.vs/
/Msi
packages/
*.psess
*.pyc
/ExtLibs/Mavlink/mavlink
/LogAnalyzer/py2exe/
*.vspx
*.appx
*.zip
/Drivers/gencert.bat
/Drivers/makecert.exe
/Drivers/signing.url
/ExtLibs/Zeroconf
/ExtLibs/wasm/wwwroot/2018-09-09 18-15-17.txt
/ExtLibs/Test
/ExtLibs/AltitudeAngelWings/Keys.config
/Drivers/DriverCleanup.pdb
/Drivers/DriverCleanup.exe.config
/Drivers/DriverCleanup.exe
/objcore
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "ExtLibs/mono"]
path = ExtLibs/mono
url = https://github.com/meee1/mono.git
branch = master2
10 changes: 10 additions & 0 deletions .nuget/NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,14 @@
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageSources>
<clear />
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
<add key="extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
<add key="entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
<add key="aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
<add key="aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />

</packageSources>
</configuration>
Binary file modified .nuget/NuGet.exe
Binary file not shown.
10 changes: 5 additions & 5 deletions .nuget/NuGet.targets
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>

<!-- Enable the restore command to run before builds -->
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>

<!-- Property that enables building a package from a project -->
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
Expand Down Expand Up @@ -58,12 +58,12 @@
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
<NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>

<PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
<PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
<PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">$(SolutionDir)</PaddedSolutionDir>
<PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">$(SolutionDir)</PaddedSolutionDir>

<!-- Commands -->
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) </RestoreCommand>
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory $(PackageOutputDir) -symbols</BuildCommand>

<!-- We need to ensure packages are restored prior to assembly resolve -->
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
Expand Down
Loading

0 comments on commit 2f6c1d7

Please sign in to comment.