diff --git a/NuGet.config b/NuGet.config index dc720faec..ce5c64f79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,9 @@ - + + + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 56984cdcd..a214842a0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -14,11 +14,11 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NETCoreApp30RuntimePackVersion>3.0.1 + <_NETCoreApp30RuntimePackVersion>3.0.2 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_WindowsDesktop30RuntimePackVersion>3.0.1 + <_WindowsDesktop30RuntimePackVersion>3.0.2 <_WindowsDesktop30TargetingPackVersion>3.0.0 - <_AspNet30RuntimePackVersion>3.0.1 + <_AspNet30RuntimePackVersion>3.0.2 <_AspNet30TargetingPackVersion>3.0.1 @@ -92,7 +92,7 @@ + LatestVersion="2.1.15" /> + LatestVersion="2.1.15"/> + LatestVersion="2.1.15"/> t.RuntimeIdentifier != null) - ?.Libraries?.SingleOrDefault(l => - string.Compare(l.Name, packageName, StringComparison.CurrentCultureIgnoreCase) == 0) - ?.Version; - } - - [Fact] - public void WeCoverLatestNetCoreAppRollForward() - { - // Run "dotnet new console", get TargetFramework property, and make sure it's covered in SupportedNetCoreAppVersions - var directory = TestAssets.CreateTestDirectory(); - string projectDirectory = directory.FullName; - - new NewCommandShim() - .WithWorkingDirectory(projectDirectory) - .Execute("console --no-restore") - .Should().Pass(); - - string projectPath = Path.Combine(projectDirectory, Path.GetFileName(projectDirectory) + ".csproj"); - - var project = XDocument.Load(projectPath); - var ns = project.Root.Name.Namespace; - - string targetFramework = project.Root.Element(ns + "PropertyGroup") - .Element(ns + "TargetFramework") - .Value; - - SupportedNetCoreAppVersions.Versions.Select(v => $"netcoreapp{v}") - .Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)}.{nameof(SupportedNetCoreAppVersions.Versions)} property should include the default version " + - "of .NET Core created by \"dotnet new\""); - } - - [Fact] - public void WeCoverLatestAspNetCoreAppRollForward() - { - var directory = TestAssets.CreateTestDirectory(); - string projectDirectory = directory.FullName; - - // Run "dotnet new web", get TargetFramework property, and make sure it's covered in SupportedAspNetCoreAppVersions - - new NewCommandShim() - .WithWorkingDirectory(projectDirectory) - .Execute("web --no-restore") - .Should().Pass(); - - string projectPath = Path.Combine(projectDirectory, Path.GetFileName(projectDirectory) + ".csproj"); - - var project = XDocument.Load(projectPath); - var ns = project.Root.Name.Namespace; - - string targetFramework = project.Root.Element(ns + "PropertyGroup") - .Element(ns + "TargetFramework") - .Value; - - SupportedAspNetCoreVersions.Versions.Select(v => $"netcoreapp{v}") - .Should().Contain(targetFramework, $"the {nameof(SupportedAspNetCoreVersions)} should include the default version " + - "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\""); - - - } - - } -} diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 13c5859e5..a1bbf00f4 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -145,6 +145,21 @@ Skip="true" Issue="" Reason="Needs .NET Core 1.1"/> + + + + + +