Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert the package to a single assembly to follow the guidelines for… #345

Merged
merged 17 commits into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: 7.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build solution
Expand Down
23 changes: 10 additions & 13 deletions .github/workflows/publish.yml → .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ on:
env:
BRANCH: master

# remove and adjust building a nuget package to the latest requirements
NUGET_ENABLE_LEGACY_CSPROJ_PACK: true

defaults:
run:
working-directory: src
Expand All @@ -21,31 +18,31 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
- name: Setup NuGet.exe
uses: nuget/setup-nuget@v1
with:
nuget-api-key: ${{ secrets.nuget_api_key }}
nuget-version: 'latest'
dotnet-version: 7.0.x

- name: Restore dependencies
run: dotnet restore

- name: Build solution
run: dotnet build --configuration Release --no-restore

- name: Run tests
run: dotnet test --no-restore

- shell: pwsh
name: Create SNK File
env:
SNK: ${{ secrets.snk }}
run: |
$snk = [Convert]::FromBase64String("$env:SNK")
Set-Content "Solution Items\GiGraph.snk" -Value $snk -AsByteStream

- name: Build NuGet Package
run: |
nuget pack "GiGraph.Dot\GiGraph.Dot.csproj" -Build -Symbols -Properties "Configuration=Publish;repository=${{ github.repository }};branch=${{ env.BRANCH }};commit=${{ github.sha }}" -IncludeReferencedProjects -SymbolPackageFormat snupkg -OutputFileNamesWithoutVersion
run: dotnet pack GiGraph.Dot\GiGraph.Dot.csproj --configuration Publish -p:Repository=${{ github.repository }} -p:Branch=${{ env.BRANCH }} -p:Commit=${{ github.sha }}

- name: Publish NuGet Package
run: |
nuget push GiGraph.Dot.nupkg -Source https://api.nuget.org/v3/index.json
run: dotnet nuget push GiGraph.Dot\bin\Publish\GiGraph.Dot.*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.nuget_api_key }}
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ orleans.codegen.cs

# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk
*.snk

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
Expand Down Expand Up @@ -348,7 +348,7 @@ MigrationBackup/

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

.idea/

# macOS
Expand Down
8 changes: 8 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>

<PropertyGroup>
<LangVersion>latest</LangVersion>
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>

</Project>
File renamed without changes.
87 changes: 87 additions & 0 deletions GiGraph.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30011.22
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GiGraph.Dot.Examples", "src\GiGraph.Dot.Examples\GiGraph.Dot.Examples.csproj", "{A9472EBB-A99C-4533-A081-75DEABC15CD9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GiGraph.Dot", "src\GiGraph.Dot\GiGraph.Dot.csproj", "{BAC8EB9A-B449-4697-AC51-9A34FEDD0EC3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GiGraph.Dot.Entities.Tests", "test\GiGraph.Dot.Entities.Tests\GiGraph.Dot.Entities.Tests.csproj", "{070671C7-38EB-4274-87F1-95FA02407CBC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GiGraph.Dot.Types.Tests", "test\GiGraph.Dot.Types.Tests\GiGraph.Dot.Types.Tests.csproj", "{BCA1E2F9-1ADB-44B1-BA3F-2BBCABC02CE2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GiGraph.Dot.Output.Tests", "test\GiGraph.Dot.Output.Tests\GiGraph.Dot.Output.Tests.csproj", "{7970E3B9-39DB-4206-9D76-30B497D42537}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GiGraph.Dot.Tests", "test\GiGraph.Dot.Tests\GiGraph.Dot.Tests.csproj", "{D99EADAB-E47B-431F-BC83-19C445965D44}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{332941F6-4FF7-4D05-88DC-4FC86062EC73}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C45F0348-82F4-4C1E-9B44-3BA16FDE0D5F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ADR", "ADR", "{5056782F-8426-44B8-88C9-AEC9C698E5F9}"
ProjectSection(SolutionItems) = preProject
src\ADR\01. Extensibility.md = src\ADR\01. Extensibility.md
src\ADR\02. Enumerations.md = src\ADR\02. Enumerations.md
src\ADR\03. Attribute key mapping.md = src\ADR\03. Attribute key mapping.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Publish|Any CPU = Publish|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A9472EBB-A99C-4533-A081-75DEABC15CD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9472EBB-A99C-4533-A081-75DEABC15CD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9472EBB-A99C-4533-A081-75DEABC15CD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A9472EBB-A99C-4533-A081-75DEABC15CD9}.Release|Any CPU.Build.0 = Release|Any CPU
{A9472EBB-A99C-4533-A081-75DEABC15CD9}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{BAC8EB9A-B449-4697-AC51-9A34FEDD0EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BAC8EB9A-B449-4697-AC51-9A34FEDD0EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BAC8EB9A-B449-4697-AC51-9A34FEDD0EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BAC8EB9A-B449-4697-AC51-9A34FEDD0EC3}.Release|Any CPU.Build.0 = Release|Any CPU
{BAC8EB9A-B449-4697-AC51-9A34FEDD0EC3}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{BAC8EB9A-B449-4697-AC51-9A34FEDD0EC3}.Publish|Any CPU.Build.0 = Publish|Any CPU
{070671C7-38EB-4274-87F1-95FA02407CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{070671C7-38EB-4274-87F1-95FA02407CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{070671C7-38EB-4274-87F1-95FA02407CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{070671C7-38EB-4274-87F1-95FA02407CBC}.Release|Any CPU.Build.0 = Release|Any CPU
{070671C7-38EB-4274-87F1-95FA02407CBC}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{070671C7-38EB-4274-87F1-95FA02407CBC}.Publish|Any CPU.Build.0 = Publish|Any CPU
{BCA1E2F9-1ADB-44B1-BA3F-2BBCABC02CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BCA1E2F9-1ADB-44B1-BA3F-2BBCABC02CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BCA1E2F9-1ADB-44B1-BA3F-2BBCABC02CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BCA1E2F9-1ADB-44B1-BA3F-2BBCABC02CE2}.Release|Any CPU.Build.0 = Release|Any CPU
{BCA1E2F9-1ADB-44B1-BA3F-2BBCABC02CE2}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{BCA1E2F9-1ADB-44B1-BA3F-2BBCABC02CE2}.Publish|Any CPU.Build.0 = Publish|Any CPU
{7970E3B9-39DB-4206-9D76-30B497D42537}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7970E3B9-39DB-4206-9D76-30B497D42537}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7970E3B9-39DB-4206-9D76-30B497D42537}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7970E3B9-39DB-4206-9D76-30B497D42537}.Release|Any CPU.Build.0 = Release|Any CPU
{7970E3B9-39DB-4206-9D76-30B497D42537}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{7970E3B9-39DB-4206-9D76-30B497D42537}.Publish|Any CPU.Build.0 = Publish|Any CPU
{D99EADAB-E47B-431F-BC83-19C445965D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D99EADAB-E47B-431F-BC83-19C445965D44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D99EADAB-E47B-431F-BC83-19C445965D44}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D99EADAB-E47B-431F-BC83-19C445965D44}.Release|Any CPU.Build.0 = Release|Any CPU
{D99EADAB-E47B-431F-BC83-19C445965D44}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{D99EADAB-E47B-431F-BC83-19C445965D44}.Publish|Any CPU.Build.0 = Publish|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E3360D57-72FA-438A-9E1A-DA7F873758C0}
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{BAC8EB9A-B449-4697-AC51-9A34FEDD0EC3} = {332941F6-4FF7-4D05-88DC-4FC86062EC73}
{A9472EBB-A99C-4533-A081-75DEABC15CD9} = {332941F6-4FF7-4D05-88DC-4FC86062EC73}
{D99EADAB-E47B-431F-BC83-19C445965D44} = {C45F0348-82F4-4C1E-9B44-3BA16FDE0D5F}
{070671C7-38EB-4274-87F1-95FA02407CBC} = {C45F0348-82F4-4C1E-9B44-3BA16FDE0D5F}
{7970E3B9-39DB-4206-9D76-30B497D42537} = {C45F0348-82F4-4C1E-9B44-3BA16FDE0D5F}
{BCA1E2F9-1ADB-44B1-BA3F-2BBCABC02CE2} = {C45F0348-82F4-4C1E-9B44-3BA16FDE0D5F}
{5056782F-8426-44B8-88C9-AEC9C698E5F9} = {332941F6-4FF7-4D05-88DC-4FC86062EC73}
EndGlobalSection
EndGlobal
Loading