Skip to content

Commit 1f7ee70

Browse files
Merge pull request #19 from SixLabors/js/fixes-and-updates
Fixes and updates
2 parents 25f5653 + 4db03de commit 1f7ee70

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

msbuild/props/SixLabors.Global.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
| >=netcoreapp3.1 | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
128128
| netcoreapp2.1 | Y | Y | Y | Y | Y | N | Y | N | Y | N |
129129
| netcoreapp2.0 | Y | N | N | N | N | N | Y | N | Y | N |
130-
| netstandard2.1 | Y | Y | N | Y | Y | N | Y | N | Y | Y |
130+
| netstandard2.1 | Y | Y | N | Y | Y | N | Y | N | Y | N |
131131
| netstandard2.0 | N | N | N | N | N | N | Y | N | N | N |
132132
| netstandard1.3 | N | N | N | N | N | N | N | N | N | N |
133133
| net472, net48 | N | N | Y | N | N | N | Y | N | N | N |
@@ -154,7 +154,6 @@
154154
<DefineConstants>$(DefineConstants);SUPPORTS_ENCODING_STRING</DefineConstants>
155155
<DefineConstants>$(DefineConstants);SUPPORTS_CODECOVERAGE</DefineConstants>
156156
<DefineConstants>$(DefineConstants);SUPPORTS_CREATESPAN</DefineConstants>
157-
<DefineConstants>$(DefineConstants);SUPPORTS_BITOPERATIONS</DefineConstants>
158157
</PropertyGroup>
159158
</When>
160159
<When Condition="'$(TargetFramework)' == 'netcoreapp2.0'">

msbuild/props/SixLabors.Src.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- Package references and additional files which are consumed by src projects. CI Only -->
5050
<ItemGroup Condition="'$(IsContinuousIntegration)'=='true'">
5151
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" IsImplicitlyDefined="true" />
52-
<PackageReference Include="MinVer" PrivateAssets="All" Version="2.3.1" IsImplicitlyDefined="true"/>
52+
<PackageReference Include="MinVer" PrivateAssets="All" Version="2.5.0" IsImplicitlyDefined="true"/>
5353
</ItemGroup>
5454

5555
</Project>

tests/SharedInfrastructure.Tests/DebugGuardTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public void MustBeLessThanOrEqualTo_IsGreater_ThrowsNoException()
171171
ArgumentOutOfRangeException exception = Assert.Throws<ArgumentOutOfRangeException>(() => DebugGuard.MustBeLessThanOrEqualTo(2, 1, "myParamName"));
172172

173173
Assert.Equal("myParamName", exception.ParamName);
174-
Assert.Contains($"Value 2 must be less than or equal to 1.", exception.Message);
174+
Assert.Contains("Value 2 must be less than or equal to 1.", exception.Message);
175175
}
176176

177177
[Fact]
@@ -203,7 +203,7 @@ public void MustBeGreaterThanOrEqualTo_IsLess_ThrowsNoException()
203203
() => DebugGuard.MustBeGreaterThanOrEqualTo(1, 2, "myParamName"));
204204

205205
Assert.Equal("myParamName", exception.ParamName);
206-
Assert.Contains($"Value 1 must be greater than or equal to 2.", exception.Message);
206+
Assert.Contains("Value 1 must be greater than or equal to 2.", exception.Message);
207207
}
208208

209209
[Theory]
@@ -219,7 +219,7 @@ public void MustBeSizedAtLeast_Array_LengthIsLess_ThrowsException()
219219
() => DebugGuard.MustBeSizedAtLeast<int>(new int[] { 1, 2 }, 3, "myParamName"));
220220

221221
Assert.Equal("myParamName", exception.ParamName);
222-
Assert.Contains($"The size must be at least 3.", exception.Message);
222+
Assert.Contains("The size must be at least 3.", exception.Message);
223223
}
224224
}
225225
}

0 commit comments

Comments
 (0)