diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cc5d224d..5afe1ca56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 226e6931f5d9a664cee53bf79154d703b527690c + 9b0e82ce309d592f30e1ddd6054b7461bd5661fc - + https://github.com/dotnet/windowsdesktop - 226e6931f5d9a664cee53bf79154d703b527690c + 9b0e82ce309d592f30e1ddd6054b7461bd5661fc - + https://github.com/dotnet/windowsdesktop - 226e6931f5d9a664cee53bf79154d703b527690c + 9b0e82ce309d592f30e1ddd6054b7461bd5661fc - + https://github.com/dotnet/runtime - 5d0817a2136b84580a78fea5bfbe9910098bed2b + 3ffaab9b6f90c8f5169cf529035d209b060b1d83 - + https://github.com/dotnet/runtime - 5d0817a2136b84580a78fea5bfbe9910098bed2b + 3ffaab9b6f90c8f5169cf529035d209b060b1d83 - + https://github.com/dotnet/runtime - 5d0817a2136b84580a78fea5bfbe9910098bed2b + 3ffaab9b6f90c8f5169cf529035d209b060b1d83 - + https://github.com/dotnet/runtime - 5d0817a2136b84580a78fea5bfbe9910098bed2b + 3ffaab9b6f90c8f5169cf529035d209b060b1d83 - + https://github.com/dotnet/runtime - 5d0817a2136b84580a78fea5bfbe9910098bed2b + 3ffaab9b6f90c8f5169cf529035d209b060b1d83 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5d0817a2136b84580a78fea5bfbe9910098bed2b + 3ffaab9b6f90c8f5169cf529035d209b060b1d83 - + https://github.com/dotnet/aspnetcore - 9ab99b219c3a867a31c733103160c88394b9f120 + 2d6e985887068528980b5037b945232f35ef8019 - + https://github.com/dotnet/aspnetcore - 9ab99b219c3a867a31c733103160c88394b9f120 + 2d6e985887068528980b5037b945232f35ef8019 - + https://github.com/dotnet/aspnetcore - 9ab99b219c3a867a31c733103160c88394b9f120 + 2d6e985887068528980b5037b945232f35ef8019 - + https://github.com/dotnet/aspnetcore - 9ab99b219c3a867a31c733103160c88394b9f120 + 2d6e985887068528980b5037b945232f35ef8019 - + https://github.com/dotnet/aspnetcore - 9ab99b219c3a867a31c733103160c88394b9f120 + 2d6e985887068528980b5037b945232f35ef8019 - + https://github.com/dotnet/aspnetcore - 9ab99b219c3a867a31c733103160c88394b9f120 + 2d6e985887068528980b5037b945232f35ef8019 https://github.com/dotnet/test-templates @@ -79,43 +79,43 @@ https://github.com/dotnet/test-templates cb722862f3d76493dc5047a0c30e3bd5f4391170 - + https://github.com/dotnet/templating - d1fdd469d6ee0c059d8957f68620f5745b577fd3 + 22c7a0edfa8445f1de5d18e35f816ea01e98f4d8 - + https://github.com/dotnet/sdk - 6947d45754a6df105c71ba4541a29ae4934c495f + 23f0b5c722ea6dfe049b54e3d0f7cabc42811ce3 - + https://github.com/dotnet/sdk - 6947d45754a6df105c71ba4541a29ae4934c495f + 23f0b5c722ea6dfe049b54e3d0f7cabc42811ce3 - + https://github.com/dotnet/winforms - 7e785d00865a3b7fa3b5f6a2c87a1f0afd04632b + 970b01adc9d7d767115a8a8c29772b3b472f166c - + https://github.com/dotnet/wpf - 65182bad588389de8ee5413b14ec6fd6805516aa + 0400cb5ef465884cb650a1a9e7868e272078208a - + https://github.com/dotnet/fsharp - 35aca7bc7e0b3fdb123e8953385b25316d5e3851 + 8b1d616a7464314af09b30ad413a3d41a060eb16 https://github.com/microsoft/vstest bdf1629e12c05a5fd17bf7de48e7e50a8f739170 - + https://github.com/mono/linker - 7f7eb298a1ea6a144b2fb795ca10feb138e3988a + 1ed6f39a6e716b42fa5e478dcfd30a59f1c8f25e linker - + https://github.com/dotnet/roslyn - 3e252059f200440480525f667680081c0cb66afd + a03881e08eb389ed5c2475484c5102e952d1f86f https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 79c74b52a..10993ff50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,15 +24,15 @@ - 6.0.0-preview.4.21213.10 + 6.0.0-preview.4.21215.2 - 6.0.0-preview.4.21213.18 + 6.0.0-preview.4.21215.2 - 6.0.100-preview.4.21213.1 + 6.0.100-preview.4.21216.1 @@ -45,42 +45,42 @@ - 6.0.0-preview.4.21213.1 - 6.0.0-preview.4.21213.1 - 6.0.0-preview.4.21213.1 - 6.0.0-preview.4.21213.1 - 6.0.0-preview.4.21213.1 - 6.0.0-preview.4.21213.1 + 6.0.0-preview.4.21215.16 + 6.0.0-preview.4.21215.16 + 6.0.0-preview.4.21215.16 + 6.0.0-preview.4.21215.16 + 6.0.0-preview.4.21215.16 + 6.0.0-preview.4.21215.16 0.2.0 - 6.0.100-preview.4.21214.10 - 6.0.100-preview.4.21214.10 + 6.0.100-preview.4.21216.9 + 6.0.100-preview.4.21216.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.4.21213.3 + 6.0.0-preview.4.21215.2 - 6.0.0-preview.4.21213.3 - 6.0.0-preview.4.21213.3 - 6.0.0-preview.4.21213.3 - 6.0.0-preview.4.21213.3 - 6.0.0-preview.4.21213.3 + 6.0.0-preview.4.21215.2 + 6.0.0-preview.4.21215.2 + 6.0.0-preview.4.21215.2 + 6.0.0-preview.4.21215.2 + 6.0.0-preview.4.21215.2 2.1.0 - 6.0.0-preview.4.21213.9 - 6.0.0-preview.4.21213.9 - 6.0.0-preview.4.21213.9 + 6.0.0-preview.4.21215.3 + 6.0.0-preview.4.21215.3 + 6.0.0-preview.4.21215.3 diff --git a/test/EndToEnd/EndToEnd.Tests.csproj b/test/EndToEnd/EndToEnd.Tests.csproj index 19303cea7..fb7ef6a03 100644 --- a/test/EndToEnd/EndToEnd.Tests.csproj +++ b/test/EndToEnd/EndToEnd.Tests.csproj @@ -9,6 +9,10 @@ + + + + diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs new file mode 100644 index 000000000..1d9ec8a94 --- /dev/null +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using FluentAssertions; +using Microsoft.DotNet.Tools.Test.Utilities; +using Microsoft.NET.Sdk.WorkloadManifestReader; +using Xunit; +using Xunit.Abstractions; + +namespace EndToEnd.Tests +{ + public class ValidateInsertedManifests : TestBase + { + private readonly ITestOutputHelper output; + + public ValidateInsertedManifests(ITestOutputHelper output) + { + this.output = output; + } + + [Fact] + public void ManifestReaderCanReadManifests() + { + var sdkManifestDir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk-manifests"); + var sdkversionDir = new DirectoryInfo(sdkManifestDir).EnumerateDirectories().First(); + foreach (var manifestDir in sdkversionDir.EnumerateDirectories()) + { + var manifestId = manifestDir.Name; + + string manifestFile = manifestDir.GetFile("WorkloadManifest.json").FullName; + + File.Exists(manifestFile).Should().BeTrue(); + using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read); + Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream); + readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid"); + } + + } + } +}