Skip to content

Commit 4fe7d70

Browse files
authored
infra: update dependencies and test runtimes (#322)
1 parent 64fdff7 commit 4fe7d70

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
<ItemGroup>
5050
<!-- For x-plat development. Workaround for https://github.com/dotnet/sdk/issues/335 -->
51-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="all" />
51+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
5252
</ItemGroup>
5353

5454
<Import Project="$(MSBuildProjectDirectory)/releasenotes.props"

azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ jobs:
2828
vmImage: $(vmImage)
2929
steps:
3030
- task: UseDotNet@2
31-
displayName: Install .NET Core 3 SDK
31+
displayName: Install .NET Core 3.1 SDK
3232
inputs:
33-
version: '3.0.x'
33+
version: '3.1.x'
3434
packageType: sdk
3535
- task: UseDotNet@2
36-
displayName: Install .NET Core 2.2 runtime
36+
displayName: Install .NET Core 2.1 runtime
3737
inputs:
38-
version: '2.2.x'
38+
version: '2.1.x'
3939
packageType: runtime
4040
- powershell: ./build.ps1 -ci
4141
displayName: Invoke build.ps1

src/CommandLineUtils/McMaster.Extensions.CommandLineUtils.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ McMaster.Extensions.CommandLineUtils.ArgumentEscaper
2626
</PropertyGroup>
2727

2828
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
29-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
29+
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
3030
</ItemGroup>
3131

3232
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
3333
<Reference Include="System.ComponentModel.DataAnnotations" />
3434
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
35-
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
35+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
3636
</ItemGroup>
3737

3838
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">

src/Directory.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project InitialTargets="UpdateCiSettings">
22

33
<ItemGroup Condition=" '$(CI)' == 'true' ">
4-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
4+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
55
</ItemGroup>
66

77
<ItemGroup Condition="'$(DisablePublicApiAnalyzer)' != 'true'">
8-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="2.9.6" PrivateAssets="All" />
8+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="2.9.8" PrivateAssets="All" />
99
<AdditionalFiles Include="PublicAPI.Shipped.txt" />
1010
<AdditionalFiles Include="PublicAPI.Unshipped.txt" />
1111
</ItemGroup>

test/CommandLineUtils.Tests/McMaster.Extensions.CommandLineUtils.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;netcoreapp2.2</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
55
<TargetFrameworks Condition="'$(TestFullFramework)' != 'false'">$(TargetFrameworks);net472</TargetFrameworks>
66
</PropertyGroup>
77

@@ -14,10 +14,10 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1919
<PackageReference Include="FluentAssertions" Version="5.9.0" />
20-
<PackageReference Include="Moq" Version="4.10.0" />
20+
<PackageReference Include="Moq" Version="4.13.1" />
2121
<PackageReference Include="xunit" Version="2.4.1" />
2222
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
2323
</ItemGroup>

test/CommandLineUtils.Tests/OptionAttributeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public void BindsToStaticProperties()
241241
Assert.Equal(1, PrivateSetterProgram.StaticNumber);
242242
}
243243

244-
#if !NETCOREAPP3_0
244+
#if !NETCOREAPP3_1
245245
// .NET Core 3.0 made an intentional breaking change
246246
// see https://github.com/dotnet/coreclr/issues/21268
247247
[Fact]

test/Hosting.CommandLine.Tests/McMaster.Extensions.Hosting.CommandLine.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;netcoreapp2.2</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
55
<TargetFrameworks Condition="'$(TestFullFramework)' != 'false'">$(TargetFrameworks);net472</TargetFrameworks>
66
</PropertyGroup>
77

@@ -14,8 +14,8 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
18-
<PackageReference Include="Moq" Version="4.10.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
18+
<PackageReference Include="Moq" Version="4.13.1" />
1919
<PackageReference Include="xunit" Version="2.4.1" />
2020
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
2121
</ItemGroup>

0 commit comments

Comments
 (0)