You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2020/04/26 12:51:26 UTC
[ignite] branch master updated: IGNITE-12940 .NET: Use fixed NuGet
version in build script
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 84f0093 IGNITE-12940 .NET: Use fixed NuGet version in build script
84f0093 is described below
commit 84f00937e598bd74ccddd4da3f1b85c3f67b90e7
Author: Pavel Tupitsyn <pt...@apache.org>
AuthorDate: Sun Apr 26 15:51:12 2020 +0300
IGNITE-12940 .NET: Use fixed NuGet version in build script
New NuGet release has a bug causing failing builds: https://github.com/NuGet/Home/issues/9458
To fix this and prevent future issues, use a fixed NuGet version instead of the latest.
---
.../dotnet/Apache.Ignite.Core.Tests.NuGet/install-package.ps1 | 4 ++--
.../Cache/Query/Linq/CacheLinqTest.Misc.cs | 1 -
.../dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs | 9 ---------
.../Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs | 2 --
.../Apache.Ignite.Core/Configuration/DataRegionConfiguration.cs | 1 -
.../Apache.Ignite.Core/Configuration/DataStorageConfiguration.cs | 1 -
.../platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs | 2 --
modules/platforms/dotnet/build.ps1 | 2 +-
8 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/install-package.ps1 b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/install-package.ps1
index 8d36e0e..7dada3a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/install-package.ps1
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/install-package.ps1
@@ -14,11 +14,11 @@ rmdir packages -Force -Recurse
# Detect NuGet
$ng = "nuget"
if ((Get-Command $ng -ErrorAction SilentlyContinue) -eq $null) {
- $ng = ".\nuget.exe"
+ $ng = "$PSScriptRoot\..\nuget.exe"
if (-not (Test-Path $ng)) {
echo "Downloading NuGet..."
- (New-Object System.Net.WebClient).DownloadFile("https://dist.nuget.org/win-x86-commandline/v3.3.0/nuget.exe", "nuget.exe");
+ (New-Object System.Net.WebClient).DownloadFile("https://dist.nuget.org/win-x86-commandline/v5.3.1/nuget.exe", $ng)
}
}
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Linq/CacheLinqTest.Misc.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Linq/CacheLinqTest.Misc.cs
index 9b817c6..3341200 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Linq/CacheLinqTest.Misc.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Linq/CacheLinqTest.Misc.cs
@@ -30,7 +30,6 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Linq
using System.Linq;
using Apache.Ignite.Core.Cache;
using Apache.Ignite.Core.Cache.Configuration;
- using Apache.Ignite.Core.Common;
using Apache.Ignite.Linq;
using NUnit.Framework;
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs
index 1594fae..543287e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs
@@ -449,14 +449,5 @@ namespace Apache.Ignite.Core.Tests.Log
throw new ArithmeticException("Error in func.");
}
}
-
- /// <summary>
- /// Custom enum for testing.
- /// </summary>
- private struct CustomEnum
- {
- // ReSharper disable once UnusedMember.Local
- public int Field { get; set; }
- }
}
}
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
index 88d1218..82eb16c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
@@ -272,7 +272,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
/// Initializes a new instance of the <see cref="CacheConfiguration"/> class.
/// </summary>
/// <param name="reader">The reader.</param>
- /// <param name="srvVer">Server version.</param>
internal CacheConfiguration(BinaryReader reader)
{
Read(reader);
@@ -282,7 +281,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
/// Reads data into this instance from the specified reader.
/// </summary>
/// <param name="reader">The reader.</param>
- /// <param name="srvVer">Server version.</param>
private void Read(BinaryReader reader)
{
// Make sure system marshaller is used.
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Configuration/DataRegionConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Configuration/DataRegionConfiguration.cs
index 94e0d50..35417a7 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Configuration/DataRegionConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Configuration/DataRegionConfiguration.cs
@@ -120,7 +120,6 @@ namespace Apache.Ignite.Core.Configuration
/// Writes this instance to a writer.
/// </summary>
/// <param name="writer">The writer.</param>
- /// <param name="srvVer">Server version.</param>
internal void Write(IBinaryRawWriter writer)
{
writer.WriteString(Name);
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Configuration/DataStorageConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Configuration/DataStorageConfiguration.cs
index 8e3766c..2e2fc72 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Configuration/DataStorageConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Configuration/DataStorageConfiguration.cs
@@ -264,7 +264,6 @@ namespace Apache.Ignite.Core.Configuration
/// Writes this instance to the specified writer.
/// </summary>
/// <param name="writer">The writer.</param>
- /// <param name="srvVer">Server version.</param>
internal void Write(IBinaryRawWriter writer)
{
Debug.Assert(writer != null);
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
index 405ea9f..4bfefd1 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
@@ -311,7 +311,6 @@ namespace Apache.Ignite.Core
/// Writes this instance to a writer.
/// </summary>
/// <param name="writer">The writer.</param>
- /// <param name="srvVer">Server version.</param>
internal void Write(BinaryWriter writer)
{
Debug.Assert(writer != null);
@@ -929,7 +928,6 @@ namespace Apache.Ignite.Core
/// Reads data from specified reader into current instance.
/// </summary>
/// <param name="binaryReader">The binary reader.</param>
- /// <param name="srvVer">Server version.</param>
private void Read(BinaryReader binaryReader)
{
ReadCore(binaryReader);
diff --git a/modules/platforms/dotnet/build.ps1 b/modules/platforms/dotnet/build.ps1
index eb22897..8516fad 100644
--- a/modules/platforms/dotnet/build.ps1
+++ b/modules/platforms/dotnet/build.ps1
@@ -179,7 +179,7 @@ if ((Get-Command $ng -ErrorAction SilentlyContinue) -eq $null) {
if (-not (Test-Path $ng)) {
echo "Downloading NuGet..."
- (New-Object System.Net.WebClient).DownloadFile("https://dist.nuget.org/win-x86-commandline/latest/nuget.exe", "$PSScriptRoot/nuget.exe")
+ (New-Object System.Net.WebClient).DownloadFile("https://dist.nuget.org/win-x86-commandline/v5.3.1/nuget.exe", "$PSScriptRoot/nuget.exe")
}
}