Skip to content

Commit

Permalink
small improvements & cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
DocBrown101 committed Dec 23, 2024
1 parent be9d0f6 commit aff8bb7
Show file tree
Hide file tree
Showing 10 changed files with 184 additions and 212 deletions.
48 changes: 21 additions & 27 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
## 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

# User-specific files
*.rsuser
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Mono auto generated files
mono_crash.*

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
build/
bld/
[Bb]uild/*
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/

# Build scripts
![Bb]uild/
![Bb]uild/build.ps1
![Bb]uild/arm64-build.sh
![Bb]uild/x64-build.sh

# Visual Studio 2015/2017 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
Expand Down Expand Up @@ -61,6 +58,9 @@ project.lock.json
project.fragment.lock.json
artifacts/

# ASP.NET Scaffolding
ScaffoldingReadMe.txt

# StyleCop
StyleCopReport.xml

Expand Down Expand Up @@ -137,6 +137,11 @@ _TeamCity*
.axoCover/*
!.axoCover/settings.json

# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info

# Visual Studio code coverage results
*.coverage
*.coveragexml
Expand Down Expand Up @@ -275,15 +280,6 @@ FakesAssemblies/
.ntvs_analysis.dat
node_modules/

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
Expand Down Expand Up @@ -316,12 +312,6 @@ __pycache__/
# Telerik's JustMock configuration file
*.jmconfig

# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs

# OpenCover UI analysis results
OpenCover/

Expand All @@ -348,3 +338,7 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd

4 changes: 2 additions & 2 deletions arm64-build.sh → build/arm64-build.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#! /bin/sh
dotnet publish ./src/Ve.Direct.InfluxDB.Collector/Ve.Direct.InfluxDB.Collector.csproj \
dotnet publish ../src/Ve.Direct.InfluxDB.Collector/Ve.Direct.InfluxDB.Collector.csproj \
--runtime linux-arm64 \
--self-contained false \
-c Release \
-v minimal \
-f net8.0 \
-o ./build \
-o ./output/linux-arm64 \
-p:PublishReadyToRun=false \
-p:PublishSingleFile=true \
-p:CopyOutputSymbolsToPublishDirectory=false \
Expand Down
13 changes: 6 additions & 7 deletions build-all.ps1 → build/build.ps1
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
$BuildPath = "$PSScriptRoot\build"
$BuildPathWinX64 = "$BuildPath\win-x64"
$BuildPathLinuxX64 = "$BuildPath\linux-x64"
$BuildPathLinuxARM64 = "$BuildPath\linux-arm64"
$BuildPathWinX64 = ".\output\win-x64"
$BuildPathLinuxX64 = ".\output\linux-x64"
$BuildPathLinuxARM64 = ".\output\linux-arm64"
$Version = Get-Date -Format "yyyy-MM-dd" # 2020-11-1
$VersionDot = $Version -replace '-','.'

# Dotnet restore and build
dotnet publish "$PSScriptRoot\src\Ve.Direct.InfluxDB.Collector\Ve.Direct.InfluxDB.Collector.csproj" `
dotnet publish "$PSScriptRoot\..\src\Ve.Direct.InfluxDB.Collector\Ve.Direct.InfluxDB.Collector.csproj" `
--runtime win-x64 `
--self-contained false `
-c Release `
Expand All @@ -19,7 +18,7 @@ dotnet publish "$PSScriptRoot\src\Ve.Direct.InfluxDB.Collector\Ve.Direct.InfluxD
-p:Version=$VersionDot `
--nologo

dotnet publish "$PSScriptRoot\src\Ve.Direct.InfluxDB.Collector\Ve.Direct.InfluxDB.Collector.csproj" `
dotnet publish "$PSScriptRoot\..\src\Ve.Direct.InfluxDB.Collector\Ve.Direct.InfluxDB.Collector.csproj" `
--runtime linux-x64 `
--self-contained false `
-c Release `
Expand All @@ -32,7 +31,7 @@ dotnet publish "$PSScriptRoot\src\Ve.Direct.InfluxDB.Collector\Ve.Direct.InfluxD
-p:Version=$VersionDot `
--nologo

dotnet publish "$PSScriptRoot\src\Ve.Direct.InfluxDB.Collector\Ve.Direct.InfluxDB.Collector.csproj" `
dotnet publish "$PSScriptRoot\..\src\Ve.Direct.InfluxDB.Collector\Ve.Direct.InfluxDB.Collector.csproj" `
--runtime linux-arm64 `
--self-contained false `
-c Release `
Expand Down
4 changes: 2 additions & 2 deletions x64-build.sh → build/x64-build.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#! /bin/sh
dotnet publish ./src/Ve.Direct.InfluxDB.Collector/Ve.Direct.InfluxDB.Collector.csproj \
dotnet publish ../src/Ve.Direct.InfluxDB.Collector/Ve.Direct.InfluxDB.Collector.csproj \
--runtime linux-x64 \
--self-contained false \
-c Release \
-v minimal \
-f net8.0 \
-o ./build \
-o ./output/linux-x64 \
-p:PublishReadyToRun=false \
-p:PublishSingleFile=true \
-p:CopyOutputSymbolsToPublishDirectory=false \
Expand Down
Loading

0 comments on commit aff8bb7

Please sign in to comment.