Skip to content

Commit 4bd3f28

Browse files
adamgauthieradamgauthier
committed
Pack metapackage with Discord.Net.Core version
To avoid any mismatch between both versions and duplication in the code, the .nuspec file is simplified. The build process now ensures the version is set to the exact version Discord.Net.Core is packed with.
1 parent c24b7a1 commit 4bd3f28

File tree

2 files changed

+39
-41
lines changed

2 files changed

+39
-41
lines changed

‎azure/deploy.yml

+7-9
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,20 @@ steps:
1010
dotnet pack "src\Discord.Net.Interactions\Discord.Net.Interactions.csproj" --no-restore --no-build -v minimal -c $(buildConfiguration) -o "$(Build.ArtifactStagingDirectory)" /p:BuildNumber=$(buildNumber) /p:IsTagBuild=$(buildTag)
1111
displayName: Pack projects
1212

13-
- task: NuGetCommand@2
14-
displayName: Pack metapackage (release mode)
15-
condition: eq(variables['buildTag'], True)
16-
inputs:
17-
command: 'pack'
18-
packagesToPack: 'src/Discord.Net/Discord.Net.nuspec'
19-
versioningScheme: 'off'
13+
- pwsh: |
14+
$package = Get-ChildItem $(Build.ArtifactStagingDirectory)/Discord.Net.Core*.nupkg
15+
$version = $package.Name.Replace("Discord.Net.Core.", "").Replace(".nupkg", "")
16+
17+
Write-Output "##vso[task.setvariable variable=packedVersion;]$version"
18+
displayName: Retrieve packed version
2019

2120
- task: NuGetCommand@2
2221
displayName: Pack metapackage
23-
condition: eq(variables['buildTag'], False)
2422
inputs:
2523
command: 'pack'
2624
packagesToPack: 'src/Discord.Net/Discord.Net.nuspec'
2725
versioningScheme: 'off'
28-
buildProperties: 'suffix=-$(buildNumber)'
26+
buildProperties: 'version=$(packedVersion)'
2927

3028
- task: NuGetCommand@2
3129
displayName: Push to NuGet

‎src/Discord.Net/Discord.Net.nuspec

+32-32
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Discord.Net</id>
5-
<version>3.0.0-dev$suffix$</version>
5+
<version>$version$</version>
66
<title>Discord.Net</title>
77
<authors>Discord.Net Contributors</authors>
88
<owners>foxbot</owners>
@@ -14,45 +14,45 @@
1414
<iconUrl>https://github.com/RogueException/Discord.Net/raw/dev/docs/marketing/logo/PackageLogo.png</iconUrl>
1515
<dependencies>
1616
<group targetFramework="net6.0">
17-
<dependency id="Discord.Net.Core" version="3.0.0$suffix$" />
18-
<dependency id="Discord.Net.Rest" version="3.0.0$suffix$" />
19-
<dependency id="Discord.Net.WebSocket" version="3.0.0$suffix$" />
20-
<dependency id="Discord.Net.Commands" version="3.0.0$suffix$" />
21-
<dependency id="Discord.Net.Webhook" version="3.0.0$suffix$" />
22-
<dependency id="Discord.Net.Interactions" version="3.0.0$suffix$" />
17+
<dependency id="Discord.Net.Core" version="$version$" />
18+
<dependency id="Discord.Net.Rest" version="$version$" />
19+
<dependency id="Discord.Net.WebSocket" version="$version$" />
20+
<dependency id="Discord.Net.Commands" version="$version$" />
21+
<dependency id="Discord.Net.Webhook" version="$version$" />
22+
<dependency id="Discord.Net.Interactions" version="$version$" />
2323
</group>
2424
<group targetFramework="net5.0">
25-
<dependency id="Discord.Net.Core" version="3.0.0$suffix$" />
26-
<dependency id="Discord.Net.Rest" version="3.0.0$suffix$" />
27-
<dependency id="Discord.Net.WebSocket" version="3.0.0$suffix$" />
28-
<dependency id="Discord.Net.Commands" version="3.0.0$suffix$" />
29-
<dependency id="Discord.Net.Webhook" version="3.0.0$suffix$" />
30-
<dependency id="Discord.Net.Interactions" version="3.0.0$suffix$" />
25+
<dependency id="Discord.Net.Core" version="$version$" />
26+
<dependency id="Discord.Net.Rest" version="$version$" />
27+
<dependency id="Discord.Net.WebSocket" version="$version$" />
28+
<dependency id="Discord.Net.Commands" version="$version$" />
29+
<dependency id="Discord.Net.Webhook" version="$version$" />
30+
<dependency id="Discord.Net.Interactions" version="$version$" />
3131
</group>
3232
<group targetFramework="net461">
33-
<dependency id="Discord.Net.Core" version="3.0.0$suffix$" />
34-
<dependency id="Discord.Net.Rest" version="3.0.0$suffix$" />
35-
<dependency id="Discord.Net.WebSocket" version="3.0.0$suffix$" />
36-
<dependency id="Discord.Net.Commands" version="3.0.0$suffix$" />
37-
<dependency id="Discord.Net.Webhook" version="3.0.0$suffix$" />
38-
<dependency id="Discord.Net.Interactions" version="3.0.0$suffix$" />
33+
<dependency id="Discord.Net.Core" version="$version$" />
34+
<dependency id="Discord.Net.Rest" version="$version$" />
35+
<dependency id="Discord.Net.WebSocket" version="$version$" />
36+
<dependency id="Discord.Net.Commands" version="$version$" />
37+
<dependency id="Discord.Net.Webhook" version="$version$" />
38+
<dependency id="Discord.Net.Interactions" version="$version$" />
3939
</group>
4040
<group targetFramework="netstandard2.0">
41-
<dependency id="Discord.Net.Core" version="3.0.0$suffix$" />
42-
<dependency id="Discord.Net.Rest" version="3.0.0$suffix$" />
43-
<dependency id="Discord.Net.WebSocket" version="3.0.0$suffix$" />
44-
<dependency id="Discord.Net.Commands" version="3.0.0$suffix$" />
45-
<dependency id="Discord.Net.Webhook" version="3.0.0$suffix$" />
46-
<dependency id="Discord.Net.Interactions" version="3.0.0$suffix$" />
41+
<dependency id="Discord.Net.Core" version="$version$" />
42+
<dependency id="Discord.Net.Rest" version="$version$" />
43+
<dependency id="Discord.Net.WebSocket" version="$version$" />
44+
<dependency id="Discord.Net.Commands" version="$version$" />
45+
<dependency id="Discord.Net.Webhook" version="$version$" />
46+
<dependency id="Discord.Net.Interactions" version="$version$" />
4747
</group>
4848
<group targetFramework="netstandard2.1">
49-
<dependency id="Discord.Net.Core" version="3.0.0$suffix$" />
50-
<dependency id="Discord.Net.Rest" version="3.0.0$suffix$" />
51-
<dependency id="Discord.Net.WebSocket" version="3.0.0$suffix$" />
52-
<dependency id="Discord.Net.Commands" version="3.0.0$suffix$" />
53-
<dependency id="Discord.Net.Webhook" version="3.0.0$suffix$" />
54-
<dependency id="Discord.Net.Interactions" version="3.0.0$suffix$" />
49+
<dependency id="Discord.Net.Core" version="$version$" />
50+
<dependency id="Discord.Net.Rest" version="$version$" />
51+
<dependency id="Discord.Net.WebSocket" version="$version$" />
52+
<dependency id="Discord.Net.Commands" version="$version$" />
53+
<dependency id="Discord.Net.Webhook" version="$version$" />
54+
<dependency id="Discord.Net.Interactions" version="$version$" />
5555
</group>
5656
</dependencies>
5757
</metadata>
58-
</package>
58+
</package>

0 commit comments

Comments
 (0)