Skip to content

Commit 9323f95

Browse files
authored
Fixing double ci being put in nightly releases (#2551)
Adding GitHub actions yml to solution
1 parent e9096e6 commit 9323f95

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
uses: ./.github/actions/push-artifacts
6868
timeout-minutes: 10
6969
with:
70-
mdixVersion: ${{ env.mdixVersion }}-ci${{ github.run_number }}
71-
mdixColorsVersion: ${{ env.mdixColorsVersion }}-ci${{ github.run_number }}
72-
mdixMahAppsVersion: ${{ env.mdixMahappsVersion }}-ci${{ github.run_number }}
70+
mdixVersion: ${{ env.mdixVersion }}
71+
mdixColorsVersion: ${{ env.mdixColorsVersion }}
72+
mdixMahAppsVersion: ${{ env.mdixMahappsVersion }}
7373
demoAppPath: "MainDemo.Wpf/bin/${{ env.buildConfiguration }}"
7474
nugetKey: ${{ secrets.PAT }}
7575

MaterialDesignToolkit.Full.sln

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mdresgen", "mdresgen\mdresg
4949
EndProject
5050
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{18401177-A30E-4330-8F6B-101DF876CE99}"
5151
ProjectSection(SolutionItems) = preProject
52+
.github\workflows\control_styles.yml = .github\workflows\control_styles.yml
5253
.github\workflows\icon_update.yml = .github\workflows\icon_update.yml
53-
.github\workflows\nightly_release.yml = .github\workflows\nightly_release.yml
5454
.github\workflows\pr_verification.yml = .github\workflows\pr_verification.yml
5555
.github\workflows\release.yml = .github\workflows\release.yml
5656
EndProjectSection
5757
EndProject
5858
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesign3Demo", "MaterialDesign3.Demo.Wpf\MaterialDesign3Demo.csproj", "{98627CBE-F009-482E-97E9-C69C7135E91F}"
5959
EndProject
60+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build-and-test", "build-and-test", "{61415388-92DE-4415-9089-68B386FE8E3F}"
61+
ProjectSection(SolutionItems) = preProject
62+
.github\actions\build-and-test\action.yml = .github\actions\build-and-test\action.yml
63+
EndProjectSection
64+
EndProject
65+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "push-artifacts", "push-artifacts", "{BD0E73F5-2DB2-4298-BD7F-6DBE6AA451A1}"
66+
ProjectSection(SolutionItems) = preProject
67+
.github\actions\push-artifacts\action.yml = .github\actions\push-artifacts\action.yml
68+
EndProjectSection
69+
EndProject
6070
Global
6171
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6272
Debug|Any CPU = Debug|Any CPU
@@ -239,6 +249,8 @@ Global
239249
{59CE50AC-D176-4CC0-B465-26F66054A15E} = {9E303A4A-3712-44B9-91EE-830FDC087795}
240250
{18401177-A30E-4330-8F6B-101DF876CE99} = {55087897-5F09-45CA-8E12-12B36B45F262}
241251
{98627CBE-F009-482E-97E9-C69C7135E91F} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
252+
{61415388-92DE-4415-9089-68B386FE8E3F} = {18401177-A30E-4330-8F6B-101DF876CE99}
253+
{BD0E73F5-2DB2-4298-BD7F-6DBE6AA451A1} = {18401177-A30E-4330-8F6B-101DF876CE99}
242254
EndGlobalSection
243255
GlobalSection(ExtensibilityGlobals) = postSolution
244256
SolutionGuid = {730B2F9E-74AE-46CE-9E61-89AA5C6D5DD3}

0 commit comments

Comments
 (0)