Skip to content

Commit 9dfb082

Browse files
authored
Merge pull request #20 from pfpack/dev/tech_update
dev/tech_update
2 parents 8291879 + be63ffa commit 9dfb082

File tree

5 files changed

+64
-78
lines changed

5 files changed

+64
-78
lines changed

.gitattributes

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/workflows/dotnet.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: .NET
22

33
on:
44
push:
5-
branches: [ master, dev, feature/*, fix/*, release/* ]
5+
branches: [ main, dev, dev/*, feature/*, fix/*, release/* ]
66

77
pull_request:
8-
branches: [ master ]
8+
branches: [ main ]
99

1010
release:
1111
types: [ published ]
12-
branches: [ master ]
12+
branches: [ main ]
1313

1414
jobs:
1515
build:

.gitignore

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,24 @@
1313
# User-specific files (MonoDevelop/Xamarin Studio)
1414
*.userprefs
1515

16+
# Mono auto generated files
17+
mono_crash.*
18+
1619
# Build results
1720
[Dd]ebug/
1821
[Dd]ebugPublic/
1922
[Rr]elease/
2023
[Rr]eleases/
2124
x64/
2225
x86/
26+
[Ww][Ii][Nn]32/
2327
[Aa][Rr][Mm]/
2428
[Aa][Rr][Mm]64/
2529
bld/
2630
[Bb]in/
2731
[Oo]bj/
2832
[Ll]og/
33+
[Ll]ogs/
2934

3035
# Visual Studio 2015/2017 cache/options directory
3136
.vs/
@@ -39,9 +44,10 @@ Generated\ Files/
3944
[Tt]est[Rr]esult*/
4045
[Bb]uild[Ll]og.*
4146

42-
# NUNIT
47+
# NUnit
4348
*.VisualState.xml
4449
TestResult.xml
50+
nunit-*.xml
4551

4652
# Build Results of an ATL Project
4753
[Dd]ebugPS/
@@ -56,6 +62,9 @@ project.lock.json
5662
project.fragment.lock.json
5763
artifacts/
5864

65+
# ASP.NET Scaffolding
66+
ScaffoldingReadMe.txt
67+
5968
# StyleCop
6069
StyleCopReport.xml
6170

@@ -81,6 +90,7 @@ StyleCopReport.xml
8190
*.tmp_proj
8291
*_wpftmp.csproj
8392
*.log
93+
*.tlog
8494
*.vspscc
8595
*.vssscc
8696
.builds
@@ -122,9 +132,6 @@ _ReSharper*/
122132
*.[Rr]e[Ss]harper
123133
*.DotSettings.user
124134

125-
# JustCode is a .NET coding add-in
126-
.JustCode
127-
128135
# TeamCity is a build add-in
129136
_TeamCity*
130137

@@ -135,6 +142,11 @@ _TeamCity*
135142
.axoCover/*
136143
!.axoCover/settings.json
137144

145+
# Coverlet is a free, cross platform Code Coverage Tool
146+
coverage*.json
147+
coverage*.xml
148+
coverage*.info
149+
138150
# Visual Studio code coverage results
139151
*.coverage
140152
*.coveragexml
@@ -182,6 +194,8 @@ PublishScripts/
182194

183195
# NuGet Packages
184196
*.nupkg
197+
# NuGet Symbol Packages
198+
*.snupkg
185199
# The packages folder can be ignored because of Package Restore
186200
**/[Pp]ackages/*
187201
# except build/, which is used as an MSBuild target.
@@ -192,6 +206,9 @@ PublishScripts/
192206
*.nuget.props
193207
*.nuget.targets
194208

209+
# Nuget personal access tokens and Credentials
210+
# nuget.config
211+
195212
# Microsoft Azure Build Output
196213
csx/
197214
*.build.csdef
@@ -206,6 +223,8 @@ BundleArtifacts/
206223
Package.StoreAssociation.xml
207224
_pkginfo.txt
208225
*.appx
226+
*.appxbundle
227+
*.appxupload
209228

210229
# Visual Studio cache files
211230
# files ending in .cache can be ignored
@@ -255,7 +274,9 @@ ServiceFabricBackup/
255274
*.bim.layout
256275
*.bim_*.settings
257276
*.rptproj.rsuser
258-
*- Backup*.rdl
277+
*- [Bb]ackup.rdl
278+
*- [Bb]ackup ([0-9]).rdl
279+
*- [Bb]ackup ([0-9][0-9]).rdl
259280

260281
# Microsoft Fakes
261282
FakesAssemblies/
@@ -291,10 +312,6 @@ paket-files/
291312
# FAKE - F# Make
292313
.fake/
293314

294-
# JetBrains Rider
295-
.idea/
296-
*.sln.iml
297-
298315
# CodeRush personal settings
299316
.cr/personal
300317

@@ -338,3 +355,34 @@ ASALocalRun/
338355

339356
# BeatPulse healthcheck temp database
340357
healthchecksdb
358+
359+
# Backup folder for Package Reference Convert tool in Visual Studio 2017
360+
MigrationBackup/
361+
362+
# Ionide (cross platform F# VS Code tools) working folder
363+
.ionide/
364+
365+
# Fody - auto-generated XML schema
366+
FodyWeavers.xsd
367+
368+
# VS Code files for those working on multiple tools
369+
.vscode/*
370+
!.vscode/settings.json
371+
!.vscode/tasks.json
372+
!.vscode/launch.json
373+
!.vscode/extensions.json
374+
*.code-workspace
375+
376+
# Local History for Visual Studio Code
377+
.history/
378+
379+
# Windows Installer files from build outputs
380+
*.cab
381+
*.msi
382+
*.msix
383+
*.msm
384+
*.msp
385+
386+
# JetBrains Rider
387+
.idea/
388+
*.sln.iml

src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>net6.0</TargetFramework>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<InvariantGlobalization>true</InvariantGlobalization>
78
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
89
<IsPackable>false</IsPackable>
910
<Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
@@ -17,9 +18,9 @@
1718
</ItemGroup>
1819

1920
<ItemGroup>
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
2122
<PackageReference Include="Moq" Version="4.16.1" />
22-
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="2.0.6" />
23+
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
2324
<PackageReference Include="xunit" Version="2.4.1" />
2425
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2526
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>net5.0</TargetFramework>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<InvariantGlobalization>true</InvariantGlobalization>
78
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
99
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1010
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1111
<PackageReadmeFile>README.md</PackageReadmeFile>

0 commit comments

Comments
 (0)