mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[release/5.0.1xx] Update dependencies from dotnet/arcade (#8842)

Browse source 
[release/5.0.1xx] Update dependencies from dotnet/arcade


 - Fix compile error in test
This commit is contained in:
dotnet-maestro[bot] 2020-10-13 16:22:59 +00:00 • committed by GitHub
parent 2b63f71a6c
commit 78009f66a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
eng/Version.Details.xml
View file

@ -140,13 +140,13 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20506.7"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20510.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha> <Sha>6813f5aa511a7a4498fa217a54219b5704a01f83</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20506.7"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20510.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha> <Sha>6813f5aa511a7a4498fa217a54219b5704a01f83</Sha>
</Dependency> </Dependency>
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1"> <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -19,7 +19,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20506.7</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20510.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->

4
global.json
View file

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "5.0.100-rc.1.20452.10", "dotnet": "5.0.100-rc.2.20479.15",
"runtimes": { "runtimes": {
"dotnet": [ "dotnet": [
"$(MicrosoftNETCoreAppInternalPackageVersion)" "$(MicrosoftNETCoreAppInternalPackageVersion)"
@ -8,6 +8,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20506.7" "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20510.1"
} }
} }

5
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/FileInfoAssertions.cs
View file

@ -23,6 +23,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public FileInfo FileInfo => _fileInfo; public FileInfo FileInfo => _fileInfo;
private static DateTime defaultUtcTime = new DateTime(1601, 1, 1, 0, 0, 0);
public AndConstraint<FileInfoAssertions> Exist(string because = "", params object[] reasonArgs) public AndConstraint<FileInfoAssertions> Exist(string because = "", params object[] reasonArgs)
{ {
Execute.Assertion Execute.Assertion
@ -45,8 +47,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
var lastWriteTimeUtc = _fileInfo.LastWriteTimeUtc; var lastWriteTimeUtc = _fileInfo.LastWriteTimeUtc;
// If last write time is not valid, it will be defaultUtcTime
Execute.Assertion Execute.Assertion
.ForCondition(lastWriteTimeUtc != null) .ForCondition(!lastWriteTimeUtc.Equals(defaultUtcTime))
.BecauseOf(because, reasonArgs) .BecauseOf(because, reasonArgs)
.FailWith($"Expected File {_fileInfo.FullName} to have a LastWriteTimeUTC, but it is null."); .FailWith($"Expected File {_fileInfo.FullName} to have a LastWriteTimeUTC, but it is null.");
return new AndWhichConstraint<FileInfoAssertions, DateTimeOffset>(this, lastWriteTimeUtc); return new AndWhichConstraint<FileInfoAssertions, DateTimeOffset>(this, lastWriteTimeUtc);