Skip to content

Commit

Permalink
Update NuGet dependencies
Browse files Browse the repository at this point in the history
* Update managed dependencies (except NUnit, tools)
* Remove PlatformServices DLLs from MSI as per [1]

[1] googleapis/google-api-dotnet-client#2561
  • Loading branch information
jpassing committed Jan 19, 2024
1 parent 7047ede commit af47f06
Show file tree
Hide file tree
Showing 25 changed files with 107 additions and 120 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.CloudOSLogin.v1" Version="1.61.0.2634" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.61.0.2950" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.CloudOSLogin.v1" Version="1.66.0.3272" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.66.0.3216" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
Expand Down
14 changes: 7 additions & 7 deletions sources/Google.Solutions.Apis/Google.Solutions.Apis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<Description>API extensions library</Description>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.CloudOSLogin.v1" Version="1.61.0.2634" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.61.0.2950" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis.Logging.v2" Version="1.61.0.3108" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.CloudOSLogin.v1" Version="1.66.0.3272" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.66.0.3216" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Google.Apis.Logging.v2" Version="1.66.0.3298" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.16.3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
Expand Down
8 changes: 4 additions & 4 deletions sources/Google.Solutions.Iap/Google.Solutions.Iap.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<Description>IAP client library</Description>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Google.Solutions.ThirdParty.DockPanelSuite" Version="3.0.6.6" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.61.0.2950" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.66.0.3216" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Solutions.ThirdParty.DockPanelSuite" Version="3.0.6.6" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.61.0.2950" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.66.0.3216" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.61.0.2950" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.66.0.3216" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<Description>IAP Desktop Core library</Description>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.61.0.2950" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.66.0.3216" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Solutions.ThirdParty.DockPanelSuite" Version="3.0.6.6" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis.Logging.v2" Version="1.61.0.3108" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Google.Apis.Logging.v2" Version="1.66.0.3298" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Solutions.ThirdParty.DockPanelSuite" Version="3.0.6.6" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
<PackageReference Include="System.Text.Encoding" Version="4.3.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Google.Solutions.ThirdParty.DockPanelSuite" Version="3.0.6.6" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.CloudOSLogin.v1" Version="1.61.0.2634" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis.Logging.v2" Version="1.61.0.3108" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.CloudOSLogin.v1" Version="1.66.0.3272" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Google.Apis.Logging.v2" Version="1.66.0.3298" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Solutions.ThirdParty.DockPanelSuite" Version="3.0.6.6" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.CloudOSLogin.v1" Version="1.61.0.2634" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.CloudOSLogin.v1" Version="1.66.0.3272" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Google.Solutions.Tsc" Version="9.0.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
Expand Down
8 changes: 0 additions & 8 deletions sources/Google.Solutions.IapDesktop.Tools.props

This file was deleted.

2 changes: 1 addition & 1 deletion sources/Google.Solutions.IapDesktop.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</PropertyGroup>

<ItemGroup Condition="!$(ProjectName.EndsWith('.Test'))">
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.6.40">
<PackageReference Update="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Google.Solutions.IapDesktop.props" />
<Import Project="..\Google.Solutions.IapDesktop.Tools.props" />
<PropertyGroup>
<OutputType>WinExe</OutputType>
<AssemblyName>IapDesktop</AssemblyName>
Expand All @@ -21,18 +20,26 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Solutions.ThirdParty.DockPanelSuite" Version="3.0.6.6" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.61.0.2950" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.CloudResourceManager.v1" Version="1.66.0.3216" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NetFramework.Analyzers" Version="3.3.2">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

<!--
These packages contain tools and we must use specific versions of them.
Comment out these references before running Update-Package.
-->
<PackageReference Include="OpenCover" Version="4.6.519" />
<PackageReference Include="ReportGenerator" Version="5.1.23" />
<PackageReference Include="WiX" Version="3.11.2" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Configuration" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.16.3" />
Expand Down
2 changes: 1 addition & 1 deletion sources/Google.Solutions.Mvvm/Google.Solutions.Mvvm.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.16.3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Google.Apis" Version="1.61.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.61.0" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.61.0.3103" />
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis" Version="1.66.0" />
<PackageReference Include="Google.Apis.Auth" Version="1.66.0" />
<PackageReference Include="Google.Apis.Compute.v1" Version="1.66.0.3286" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Google.Solutions.ThirdParty.Libssh2" Version="1.11.0.34" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
Expand Down
2 changes: 1 addition & 1 deletion sources/Google.Solutions.Ssh/Google.Solutions.Ssh.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PostBuildEvent />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Google.Apis.Core" Version="1.61.0" />
<PackageReference Include="Google.Apis.Core" Version="1.66.0" />
<PackageReference Include="Google.Solutions.ThirdParty.Libssh2" Version="1.11.0.34" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
Expand Down
Loading

0 comments on commit af47f06

Please sign in to comment.