Skip to content

Commit a3f4c66

Browse files
slozierslozier
authored
Update to release versions of packages (#706)
* Update to release versions of packages * Update NuGet packages
1 parent 373abb3 commit a3f4c66

11 files changed

Lines changed: 24 additions & 18 deletions

File tree

‎Src/DLR‎

‎Src/IronPython.Modules/IronPython.Modules.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
25+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>
29-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
30-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
29+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
30+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3333
</PackageReference>

‎Src/IronPython.Modules/_socket.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2377,6 +2377,7 @@ private static SslProtocols GetProtocolType(int type) {
23772377
SslProtocols result = SslProtocols.None;
23782378

23792379
switch (type & ~PythonSsl.OP_NO_ALL) {
2380+
#pragma warning disable CA5397 // Do not use deprecated SslProtocols values
23802381
#pragma warning disable CS0618 // Type or member is obsolete
23812382
case PythonSsl.PROTOCOL_SSLv2:
23822383
result = SslProtocols.Ssl2;
@@ -2394,20 +2395,23 @@ private static SslProtocols GetProtocolType(int type) {
23942395
case PythonSsl.PROTOCOL_TLSv1_1:
23952396
result = SslProtocols.Tls11;
23962397
break;
2398+
#pragma warning restore CA5397 // Do not use deprecated SslProtocols values
23972399
case PythonSsl.PROTOCOL_TLSv1_2:
23982400
result = SslProtocols.Tls12;
23992401
break;
24002402
default:
24012403
throw new InvalidOperationException("bad ssl protocol type: " + type);
24022404
}
24032405
// Filter out requested protocol exclusions:
2406+
#pragma warning disable CA5397 // Do not use deprecated SslProtocols values
24042407
#pragma warning disable CS0618 // Type or member is obsolete
24052408
result &= (type & PythonSsl.OP_NO_SSLv3) != 0 ? ~SslProtocols.Ssl3 : ~SslProtocols.None;
24062409
result &= (type & PythonSsl.OP_NO_SSLv2) != 0 ? ~SslProtocols.Ssl2 : ~SslProtocols.None;
24072410
#pragma warning restore CS0618 // Type or member is obsolete
24082411
result &= (type & PythonSsl.OP_NO_TLSv1) != 0 ? ~SslProtocols.Tls : ~SslProtocols.None;
24092412
result &= (type & PythonSsl.OP_NO_TLSv1_1) != 0 ? ~SslProtocols.Tls11 : ~SslProtocols.None;
24102413
result &= (type & PythonSsl.OP_NO_TLSv1_2) != 0 ? ~SslProtocols.Tls12 : ~SslProtocols.None;
2414+
#pragma warning restore CA5397 // Do not use deprecated SslProtocols values
24112415
return result;
24122416
}
24132417

@@ -2424,11 +2428,13 @@ public PythonTuple cipher() {
24242428

24252429
private string ProtocolToPython() {
24262430
switch (_sslStream.SslProtocol) {
2431+
#pragma warning disable CA5397 // Do not use deprecated SslProtocols values
24272432
#pragma warning disable CS0618 // Type or member is obsolete
24282433
case SslProtocols.Ssl2: return "SSLv2";
24292434
case SslProtocols.Ssl3: return "TLSv1/SSLv3";
24302435
#pragma warning restore CS0618 // Type or member is obsolete
24312436
case SslProtocols.Tls: return "TLSv1";
2437+
#pragma warning restore CA5397 // Do not use deprecated SslProtocols values
24322438
default: return _sslStream.SslProtocol.ToString();
24332439
}
24342440
}

‎Src/IronPython.Modules/zlib/ZlibModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ An optional starting value can be specified. The returned checksum is
7575
a signed integer.")]
7676
public static int adler32([BytesConversion]IList<byte> data, long baseValue=1L)
7777
{
78-
return (int)Adler32.GetAdler32Checksum(baseValue, data.ToArray(), 0, data.Count());
78+
return (int)Adler32.GetAdler32Checksum(baseValue, data.ToArray(), 0, data.Count);
7979
}
8080

8181
[Documentation(@"crc32(string[, start]) -- Compute a CRC-32 checksum of string.

‎Src/IronPython.SQLite/IronPython.SQLite.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
25+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>

‎Src/IronPython.Wpf/IronPython.Wpf.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
26+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>

‎Src/IronPython/IronPython.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
</ItemGroup>
4747

4848
<ItemGroup>
49-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
49+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
5050
<PrivateAssets>all</PrivateAssets>
5151
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5252
</PackageReference>
53-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
54-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
53+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
54+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
5555
<PrivateAssets>all</PrivateAssets>
5656
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
5757
</PackageReference>

‎Src/IronPythonCompiler/IronPythonCompiler.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
31+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
3232
<PrivateAssets>all</PrivateAssets>
3333
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3434
</PackageReference>
35-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
35+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
3636
<PrivateAssets>all</PrivateAssets>
3737
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3838
</PackageReference>

‎Src/IronPythonConsole/IronPythonConsole.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
41+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
4242
<PrivateAssets>all</PrivateAssets>
4343
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4444
</PackageReference>
45-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
45+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
4646
<PrivateAssets>all</PrivateAssets>
4747
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4848
</PackageReference>

‎Src/IronPythonTest/IronPythonTest.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="NUnitLite" Version="3.12.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1919
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
2020
</ItemGroup>
2121

@@ -42,7 +42,7 @@
4242
</Target>
4343

4444
<ItemGroup>
45-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
45+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
4646
<PrivateAssets>all</PrivateAssets>
4747
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4848
</PackageReference>

0 commit comments

Comments
 (0)