Skip to content

Commit

Permalink
Merge pull request #1013 from dorssel/dependabot/nuget/GitVersion.MsB…
Browse files Browse the repository at this point in the history
…uild-6.0.2

Bump GitVersion.MsBuild from 6.0.1 to 6.0.2
  • Loading branch information
dorssel authored Aug 13, 2024
2 parents 9df6207 + e81071f commit 7704b39
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 39 deletions.
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ SPDX-License-Identifier: GPL-3.0-only
<!-- Use the latest .NET SDK -->
<!-- This product requires Windows 10 (Windows Server 2019) or higher -->
<MainTargetFramework>net8.0-windows10.0.17763</MainTargetFramework>
<GitVersionTargetFramework>net8.0</GitVersionTargetFramework>
</PropertyGroup>

<!-- Sane defaults; override in project where needed -->
Expand Down
15 changes: 0 additions & 15 deletions Directory.Build.targets

This file was deleted.

2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-3.0-only
<Project>
<ItemGroup>
<!-- all -->
<PackageVersion Include="GitVersion.MsBuild" Version="6.0.1" />
<PackageVersion Include="GitVersion.MsBuild" Version="6.0.2" />
<!-- Usbipd -->
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
Expand Down
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# SPDX-License-Identifier: GPL-3.0-only

---
# yaml-language-server: $schema=https://raw.githubusercontent.com/GitTools/GitVersion/main/schemas/5.12/GitVersion.configuration.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/GitTools/GitVersion/main/schemas/6.0/GitVersion.configuration.json

assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{env:GITHUB_RUN_NUMBER ?? 0}'
6 changes: 3 additions & 3 deletions Installer/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"GitVersion.MsBuild": {
"type": "Direct",
"requested": "[6.0.1, )",
"resolved": "6.0.1",
"contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
"requested": "[6.0.2, )",
"resolved": "6.0.2",
"contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
},
"WixToolset.Firewall.wixext": {
"type": "Direct",
Expand Down
6 changes: 3 additions & 3 deletions UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"GitVersion.MsBuild": {
"type": "Direct",
"requested": "[6.0.1, )",
"resolved": "6.0.1",
"contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
"requested": "[6.0.2, )",
"resolved": "6.0.2",
"contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
},
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
Expand Down
6 changes: 3 additions & 3 deletions UsbIds/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
".NETStandard,Version=v2.0": {
"GitVersion.MsBuild": {
"type": "Direct",
"requested": "[6.0.1, )",
"resolved": "6.0.1",
"contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
"requested": "[6.0.2, )",
"resolved": "6.0.2",
"contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
},
"Microsoft.CodeAnalysis.CSharp": {
"type": "Direct",
Expand Down
12 changes: 6 additions & 6 deletions Usbipd.Automation/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
".NETStandard,Version=v2.0": {
"GitVersion.MsBuild": {
"type": "Direct",
"requested": "[6.0.1, )",
"resolved": "6.0.1",
"contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
"requested": "[6.0.2, )",
"resolved": "6.0.2",
"contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
},
"NETStandard.Library": {
"type": "Direct",
Expand All @@ -26,9 +26,9 @@
"net8.0-windows10.0.17763": {
"GitVersion.MsBuild": {
"type": "Direct",
"requested": "[6.0.1, )",
"resolved": "6.0.1",
"contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
"requested": "[6.0.2, )",
"resolved": "6.0.2",
"contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Direct",
Expand Down
6 changes: 3 additions & 3 deletions Usbipd.PowerShell/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
".NETStandard,Version=v2.0": {
"GitVersion.MsBuild": {
"type": "Direct",
"requested": "[6.0.1, )",
"resolved": "6.0.1",
"contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
"requested": "[6.0.2, )",
"resolved": "6.0.2",
"contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
},
"NETStandard.Library": {
"type": "Direct",
Expand Down
6 changes: 3 additions & 3 deletions Usbipd/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"net8.0-windows10.0.17763": {
"GitVersion.MsBuild": {
"type": "Direct",
"requested": "[6.0.1, )",
"resolved": "6.0.1",
"contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
"requested": "[6.0.2, )",
"resolved": "6.0.2",
"contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
},
"Microsoft.DotNet.ILCompiler": {
"type": "Direct",
Expand Down
1 change: 0 additions & 1 deletion usbipd-win.sln
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
codecov.yml = codecov.yml
COPYING.md = COPYING.md
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props
Fake_GitVersionInformation.cs = Fake_GitVersionInformation.cs
GitVersion.yml = GitVersion.yml
Expand Down

0 comments on commit 7704b39

Please sign in to comment.