Skip to content

Commit 7e7bfee

Browse files
authored
Merge pull request #50 from messerli-informatik-ag/restructure
Restructure and update to .NET 5
2 parents df1df47 + a13a602 commit 7e7bfee

File tree

9 files changed

+17
-5
lines changed

9 files changed

+17
-5
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build
33
on:
44
push:
55
branches:
6-
- '*'
6+
- master
77

88
pull_request:
99
branches:
@@ -23,7 +23,7 @@ jobs:
2323
- name: Build
2424
run: dotnet build --configuration Release --no-restore
2525
- name: Pack
26-
run: dotnet pack --configuration Release --no-restore
26+
run: dotnet pack --configuration Release --no-restore --output nupkg
2727
- name: Test that files are importable by MSBuild
2828
run: ruby ./scripts/test_files_are_importable_by_msbuild.rb
2929
- name: Show NuGet package content

CodeStyle.sln

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.26124.0
55
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeStyle", "CodeStyle.csproj", "{72372049-E988-4FE2-BD85-447BA6F12372}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeStyle", "CodeStyle\CodeStyle.csproj", "{72372049-E988-4FE2-BD85-447BA6F12372}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Config", "Build Config", "{D44C9927-F065-4722-B9AF-7084CC067E0A}"
9+
ProjectSection(SolutionItems) = preProject
10+
global.json = global.json
11+
EndProjectSection
12+
EndProject
13+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AA84EF3C-D29F-4B6D-ADEE-E87610D0BC1C}"
14+
ProjectSection(SolutionItems) = preProject
15+
readme.md = readme.md
16+
changelog.md = changelog.md
17+
EndProjectSection
18+
EndProject
719
EndProject
820
Global
921
GlobalSection(SolutionConfigurationPlatforms) = preSolution

CodeStyle.csproj renamed to CodeStyle/CodeStyle.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<PackageId>Messerli.CodeStyle</PackageId>
88
<PackageTags>analyzers</PackageTags>
99
<PackageLicenseExpression>MIT OR Apache-2.0</PackageLicenseExpression>
10-
<PackageOutputPath>nupkg</PackageOutputPath>
1110
<Copyright>© Messerli Informatik AG. All rights reserved.</Copyright>
1211
<Description>Various analyzers bundled with opinionated configuration</Description>
1312
<NoWarn>$(NoWarn);NU5105;NU5104;NU5128</NoWarn>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

global.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"sdk": {
3-
"version": "3.1.300"
3+
"version": "5.0.100",
4+
"rollForward": "latestFeature"
45
},
56
"msbuild-sdks": {
67
"Microsoft.Build.NoTargets": "1.0.88"

0 commit comments

Comments
 (0)