diff --git a/NuGet.config b/NuGet.config index 95520261c..8d760329e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,13 +8,11 @@ - - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b8400cd3..095d67098 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e @@ -43,56 +43,56 @@ https://github.com/aspnet/AspNetCore - 7db696998c6ae4852fbf01827efdb10634e22668 + 2b7e994b8a304700a09617ffc5052f0d943bbcba - - https://github.com/aspnet/AspNetCore - 7db696998c6ae4852fbf01827efdb10634e22668 + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/aspnet/AspNetCore - 7db696998c6ae4852fbf01827efdb10634e22668 + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/aspnet/AspNetCore - 7db696998c6ae4852fbf01827efdb10634e22668 + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/aspnet/AspNetCore - 7db696998c6ae4852fbf01827efdb10634e22668 + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/aspnet/AspNetCore - 7db696998c6ae4852fbf01827efdb10634e22668 + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db https://github.com/dotnet/test-templates 5117d3d9d7dfd3583f0c42a639efaf092f957b7b - + https://github.com/dotnet/templating - b275b18fd7014d67078e2477f693301ea04e6549 + 13abe7e2749d95337e8d72efdc5b71611815fd43 - - https://github.com/dotnet/toolset - 824864bdc9b3419ce670429210f031656c05fcc2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-toolset + 411fe514b956a39d6080575cf35d2d64054a7ec0 - - https://github.com/dotnet/sdk - 49bbede419cf63e15c70f4b463f80e4811fe3f34 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 9b38eb3b6cbbc9c82270dbd4e20286007a52a165 - - https://github.com/dotnet/cli - 0e5712bd568bb17296171cf7f6bc31ecf414b0c0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-cli + 91705c83e44dd9221c3071e1bb7a87ba2f47688c - + https://github.com/dotnet/winforms - 2204c3f17bea70ee01be3b450f6b84158a80c154 + 9483a88b7764a74d71cbd449de6c56c1d5e0af21 - - https://github.com/dotnet/wpf - c8a08a25cbde21c5d45048a8719b1c64216402f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + a8e48616c8d8e56469a456eb1ee263268316b827 diff --git a/eng/Versions.props b/eng/Versions.props index e02e9d2f0..886382ecc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,19 +12,19 @@ preview - 3.1.101-servicing.19613.5 + 3.1.101-servicing.19617.13 - 4.8.1-servicing.19576.3 + 4.8.1-servicing.19605.5 - 3.1.0-rtm.19576.3 + 3.1.0-rtm.19605.7 - 3.1.0 + 3.1.1-servicing.19605.2 @@ -36,23 +36,23 @@ - 3.1.0 + 3.1.1 3.1.0 - 3.1.0-rtm.19575.14 - 3.1.0-rtm.19575.14 - 3.1.0-rtm.19575.14 - 3.1.0-rtm.19575.14 + 3.1.1-servicing.19615.10 + 3.1.1-servicing.19615.10 + 3.1.1-servicing.19615.10 + 3.1.1-servicing.19615.10 - 3.1.101-servicing.19572.3 + 3.1.101-servicing.19617.2 0.2.0 - 3.1.100-rtm.19568.4 + 3.1.101-servicing.19617.12 $(MicrosoftNETSdkPackageVersion) @@ -61,12 +61,12 @@ - 3.1.1-servicing.19576.9 - 3.1.1-servicing.19576.9 - 3.1.1-servicing.19576.9 + 3.1.1-servicing.19608.4 + 3.1.1 + 3.1.1 3.1.0 - 3.1.1-servicing.19576.9 - 3.1.1-servicing.19576.9 + 3.1.1 + 3.1.1 3.1.0 2.1.0 diff --git a/eng/build.yml b/eng/build.yml index 750111576..82a75e27a 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -73,6 +73,14 @@ phases: - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - script: 'eng\setbuildinfo.bat $(_BuildArchitecture) $(_BuildConfig)' displayName: Set test info (Windows) + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: build.cmd $(TestParameter) -pack -publish -ci @@ -90,6 +98,14 @@ phases: - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: - script: 'eng/setbuildinfo.sh $(_BuildArchitecture) $(_BuildConfig)' displayName: Set test info (Non-Windows) + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(TestParameter) 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"/> - $(VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) $(MicrosoftNETCoreAppInternalPackageVersion) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index a83319ba0..2526db643 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -3,12 +3,12 @@ 3 1 1 - 01 + 02 servicing - false + true diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs deleted file mode 100644 index 9dda617fa..000000000 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ /dev/null @@ -1,195 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; -using System.Xml.Linq; -using FluentAssertions; -using Microsoft.DotNet.TestFramework; -using Microsoft.DotNet.Tools.Test.Utilities; -using NuGet.ProjectModel; -using NuGet.Versioning; -using Xunit; - -namespace EndToEnd -{ - public partial class GivenSelfContainedAppsRollForward : TestBase - { - - [Theory] - // MemberData is used instead of InlineData here so we can access it in another test to - // verify that we are covering the latest release of .NET Core - [ClassData(typeof(SupportedNetCoreAppVersions))] - public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion) - { - if (minorVersion == "3.0" || minorVersion == "3.1") - { - // https://github.com/dotnet/core-sdk/issues/621 - return; - } - ItRollsForwardToTheLatestVersion(TestProjectCreator.NETCorePackageName, minorVersion); - } - - [Theory] - [ClassData(typeof(SupportedAspNetCoreVersions))] - public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion) - { - if (minorVersion == "3.0" || minorVersion == "3.1") - { - // https://github.com/dotnet/core-sdk/issues/621 - return; - } - ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAppPackageName, minorVersion); - } - - [Theory] - [ClassData(typeof(SupportedAspNetCoreAllVersions))] - public void ItRollsForwardToTheLatestAspNetCoreAllVersion(string minorVersion) - { - ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAllPackageName, minorVersion); - } - - internal void ItRollsForwardToTheLatestVersion(string packageName, string minorVersion) - { - var testProjectCreator = new TestProjectCreator() - { - PackageName = packageName, - MinorVersion = minorVersion, - // Set RuntimeIdentifier to opt in to roll-forward behavior - RuntimeIdentifier = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier() - }; - - var testInstance = testProjectCreator.Create(); - - string projectDirectory = testInstance.Root.FullName; - - // Get the version rolled forward to - new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should().Pass(); - - string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json"); - var assetsFile = new LockFileFormat().Read(assetsFilePath); - - var rolledForwardVersion = GetPackageVersion(assetsFile, packageName); - rolledForwardVersion.Should().NotBeNull(); - - if (rolledForwardVersion.IsPrerelease) - { - // If this version of .NET Core is still prerelease, then: - // - Floating the patch by adding ".*" to the major.minor version won't work, but - // - There aren't any patches to roll-forward to, so we skip testing this until the version - // leaves prerelease. - return; - } - - testProjectCreator.Identifier = "floating"; - - var floatingProjectInstance = testProjectCreator.Create(); - - var floatingProjectPath = Path.Combine(floatingProjectInstance.Root.FullName, "TestAppSimple.csproj"); - - var floatingProject = XDocument.Load(floatingProjectPath); - var ns = floatingProject.Root.Name.Namespace; - - - if (packageName == TestProjectCreator.NETCorePackageName) - { - // Float the RuntimeFrameworkVersion to get the latest version of the runtime available from feeds - floatingProject.Root.Element(ns + "PropertyGroup") - .Add(new XElement(ns + "RuntimeFrameworkVersion", $"{minorVersion}.*")); - } - else - { - floatingProject.Root.Element(ns + "ItemGroup") - .Element(ns + "PackageReference") - .Add(new XAttribute("Version", $"{minorVersion}.*"), - new XAttribute("AllowExplicitVersion", "true")); - } - - floatingProject.Save(floatingProjectPath); - - new RestoreCommand() - .WithWorkingDirectory(floatingProjectInstance.Root.FullName) - .Execute() - .Should().Pass(); - - string floatingAssetsFilePath = Path.Combine(floatingProjectInstance.Root.FullName, "obj", "project.assets.json"); - - var floatedAssetsFile = new LockFileFormat().Read(floatingAssetsFilePath); - - var floatedVersion = GetPackageVersion(floatedAssetsFile, packageName); - floatedVersion.Should().NotBeNull(); - - rolledForwardVersion.ToNormalizedString().Should().BeEquivalentTo(floatedVersion.ToNormalizedString(), - $"the latest patch version for {packageName} {minorVersion} in Microsoft.NETCoreSdk.BundledVersions.props " + - "needs to be updated (see the ImplicitPackageVariable items in MSBuildExtensions.targets in this repo)"); - } - - private static NuGetVersion GetPackageVersion(LockFile lockFile, string packageName) - { - return lockFile?.Targets?.SingleOrDefault(t => 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"/> + + + + + +