diff --git a/NuGet.config b/NuGet.config index 9e48ae7d9..bc03889e4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index cb76746e4..7f5aa6a66 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.3-preview - 10.0.18362.4-preview - 10.0.19041.3-preview + 10.0.17763.7 + 10.0.18362.7 + 10.0.19041.7 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d54ccef9..878194d74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - ca3be523a6af1c425f454115da70aa38ebacba21 + 5a5ce27b39b4a66be376eb6f66ddf6ec62427bcb - + https://github.com/dotnet/windowsdesktop - ca3be523a6af1c425f454115da70aa38ebacba21 + 5a5ce27b39b4a66be376eb6f66ddf6ec62427bcb - + https://github.com/dotnet/windowsdesktop - ca3be523a6af1c425f454115da70aa38ebacba21 + 5a5ce27b39b4a66be376eb6f66ddf6ec62427bcb - + https://github.com/dotnet/runtime - 3c6e6cc14728ce9a1955e076d2a758407dc70f5a + b928f03ffb8684b476cdf5c46fb92561bfbdc23c - + https://github.com/dotnet/runtime - 3c6e6cc14728ce9a1955e076d2a758407dc70f5a + b928f03ffb8684b476cdf5c46fb92561bfbdc23c - + https://github.com/dotnet/runtime - 3c6e6cc14728ce9a1955e076d2a758407dc70f5a + b928f03ffb8684b476cdf5c46fb92561bfbdc23c - + https://github.com/dotnet/runtime - 3c6e6cc14728ce9a1955e076d2a758407dc70f5a + b928f03ffb8684b476cdf5c46fb92561bfbdc23c - + https://github.com/dotnet/runtime - 3c6e6cc14728ce9a1955e076d2a758407dc70f5a + b928f03ffb8684b476cdf5c46fb92561bfbdc23c @@ -39,37 +39,37 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3c6e6cc14728ce9a1955e076d2a758407dc70f5a + b928f03ffb8684b476cdf5c46fb92561bfbdc23c - + https://github.com/dotnet/aspnetcore - a3767eedb08b55428e56f4f3f0055eb42eccf3b1 + 3f18586cf8239f2848d2f7b443c07a21c6c2f202 - + https://github.com/dotnet/aspnetcore - a3767eedb08b55428e56f4f3f0055eb42eccf3b1 + 3f18586cf8239f2848d2f7b443c07a21c6c2f202 - + https://github.com/dotnet/aspnetcore - a3767eedb08b55428e56f4f3f0055eb42eccf3b1 + 3f18586cf8239f2848d2f7b443c07a21c6c2f202 - + https://github.com/dotnet/aspnetcore - a3767eedb08b55428e56f4f3f0055eb42eccf3b1 + 3f18586cf8239f2848d2f7b443c07a21c6c2f202 - + https://github.com/dotnet/aspnetcore - a3767eedb08b55428e56f4f3f0055eb42eccf3b1 + 3f18586cf8239f2848d2f7b443c07a21c6c2f202 - + https://github.com/dotnet/aspnetcore - a3767eedb08b55428e56f4f3f0055eb42eccf3b1 + 3f18586cf8239f2848d2f7b443c07a21c6c2f202 - + https://github.com/dotnet/aspnetcore - a3767eedb08b55428e56f4f3f0055eb42eccf3b1 + 3f18586cf8239f2848d2f7b443c07a21c6c2f202 https://github.com/dotnet/test-templates @@ -79,47 +79,47 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 05138fc9225cd932738b9672e61dcaf86ec693b7 + d4d84124255605c12ea1d1e918481a4fcee9b420 - + https://github.com/dotnet/sdk - 5a707d271585bf064c808321eca42d178c291286 + 2d696a21c8e8fe15a2c3c0e8bfc8e71bd2807045 - + https://github.com/dotnet/sdk - 5a707d271585bf064c808321eca42d178c291286 + 2d696a21c8e8fe15a2c3c0e8bfc8e71bd2807045 - + https://github.com/dotnet/winforms - eb8f6a80d89400bc6965e49ef790c87c90232a64 + dc6ee51d08db4728f0580e357b56c3a3fcb3747d - + https://github.com/dotnet/wpf - c4f2fc1685094acdd011db6f83a2f2699adfb206 + 5800b00ee9595fd62006b75e62faadb1784f58a0 - + https://github.com/dotnet/fsharp - f394b34045020afb92a4510a98c8c4bde9ac33f4 + da6be68280c89131cdba2045525b80890401defd - + https://github.com/microsoft/vstest - 2418d9ec492e93245e1ce8699d6ae9cd7b86649b + 0b1e2e51743cc083d99b88673fe518672e2af9f0 - + https://github.com/mono/linker - 9cf216749f76acea43a481f03ab8095dd15351cb + e792d61a0ead2f6422b4c9af651c1128d978d454 linker - + https://github.com/dotnet/roslyn - 75d31ee941ce4dbbe5752f4ac2d5c0583f388a27 + 5df35c46ea6e3ec8fb48f01f42d40e678769cd3f - + https://github.com/dotnet/msbuild - 250161603c003af239d6e276c4fc6357586ba301 + aed5e7ed0b7e031d3e486c63b206902bf825b128 https://github.com/NuGet/NuGet.Client @@ -140,25 +140,25 @@ - + https://github.com/dotnet/arcade - 61cde6e8fb9d5c9790867b279deb41783a780cd8 + 6813f5aa511a7a4498fa217a54219b5704a01f83 - + https://github.com/dotnet/arcade - 61cde6e8fb9d5c9790867b279deb41783a780cd8 + 6813f5aa511a7a4498fa217a54219b5704a01f83 https://github.com/dotnet/source-build-reference-packages 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 - + https://github.com/dotnet/sourcelink - 8a3edd1902dbfe3adba65f22e3bb7aa2cc73e97f + 81357f3e90241d3b262289b1ffa285c9ba51d335 - + https://github.com/dotnet/xliff-tasks - 975065e08307a459dc2649b1c852f5c4cafd2f91 + d2bec3a64076f8463de4756913712badfce0a01d diff --git a/eng/Versions.props b/eng/Versions.props index 57f9bb6e8..6d117f1eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,19 +19,19 @@ - 5.0.0-beta.20474.4 + 5.0.0-beta.20510.1 - 5.0.0-rtm.20501.6 + 5.0.0-rtm.20513.5 - 5.0.0-rtm.20501.4 + 5.0.0-rtm.20513.3 - 5.0.0-rtm.20478.4 + 5.0.0-rtm.20509.1 @@ -43,43 +43,43 @@ - 5.0.0-rtm.20502.15 - 5.0.0-rtm.20502.15 - 5.0.0-rtm.20502.15 - 5.0.0-rtm.20502.15 - 5.0.0-rtm.20502.15 - 5.0.0-rtm.20502.15 - 5.0.0-rtm.20502.15 + 5.0.0 + 5.0.0 + 5.0.0-rtm.20513.4 + 5.0.0-rtm.20513.4 + 5.0.0-rtm.20513.4 + 5.0.0-rtm.20513.4 + 5.0.0-rtm.20513.4 0.2.0 - 5.0.100-rtm.20503.2 - 5.0.100-rtm.20503.2 + 5.0.100-rtm.20513.12 + 5.0.100-rtm.20513.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rtm.20502.8 + 5.0.0 - 5.0.0-rtm.20502.8 - 5.0.0-rtm.20502.8 - 5.0.0-rtm.20502.8 - 5.0.0-rtm.20502.8 - 5.0.0-rtm.20502.8 + 5.0.0-rtm.20512.4 + 5.0.0 + 5.0.0 + 5.0.0 + 5.0.0 2.1.0 - 5.0.0-rtm.20501.3 - 5.0.0-rtm.20501.3 - 5.0.0-rtm.20501.3 + 5.0.0-rtm.20513.2 + 5.0.0 + 5.0.0 @@ -105,10 +105,10 @@ 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 1.7.2 - 3.1.2 + 3.1.8 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.7 + 3.1.8 3.2.1 4.8.0-rc2.19462.10 @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.8.0-release-20200924-01 + 16.8.0-release-20201009-01 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e78ed9a1c..8b81a7e51 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -204,7 +204,7 @@ jobs: - ${{ if eq(parameters.enablePublishTestResults, 'true') }}: - task: PublishTestResults@2 - displayName: Publish Test Results + displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' @@ -213,6 +213,16 @@ jobs: mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true condition: always() + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: CopyFiles@2 diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 8427de59c..a468e92ce 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -11,7 +11,7 @@ parameters: WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion - DotNetCliPackageType: '' # optional -- either 'sdk' or 'runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index 5eceb4872..bb5f1a929 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -18,7 +18,7 @@ parameters: XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion - DotNetCliPackageType: '' # optional -- either 'sdk' or 'runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." diff --git a/global.json b/global.json index c403f91c9..b07dd147c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.100-rc.1.20452.10", + "dotnet": "5.0.100-rc.2.20479.15", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20474.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20510.1" } } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/FileInfoAssertions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/FileInfoAssertions.cs index 6cbba1560..1fec25a60 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/FileInfoAssertions.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/FileInfoAssertions.cs @@ -23,6 +23,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities public FileInfo FileInfo => _fileInfo; + private static DateTime defaultUtcTime = new DateTime(1601, 1, 1, 0, 0, 0); + public AndConstraint Exist(string because = "", params object[] reasonArgs) { Execute.Assertion @@ -45,8 +47,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { var lastWriteTimeUtc = _fileInfo.LastWriteTimeUtc; + // If last write time is not valid, it will be defaultUtcTime Execute.Assertion - .ForCondition(lastWriteTimeUtc != null) + .ForCondition(!lastWriteTimeUtc.Equals(defaultUtcTime)) .BecauseOf(because, reasonArgs) .FailWith($"Expected File {_fileInfo.FullName} to have a LastWriteTimeUTC, but it is null."); return new AndWhichConstraint(this, lastWriteTimeUtc);