diff --git a/.vsts-ci.yml b/.vsts-ci.yml index c386d8e04..67048053d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -46,30 +46,21 @@ stages: _BuildConfig: Debug _BuildArchitecture: x86 _DOTNET_CLI_UI_LANGUAGE: '' - _DropSuffix: '' Build_ES_Debug_x64: _BuildConfig: Debug _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: es - _DropSuffix: '' - Build_DropSuffix_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _DropSuffix: true # Internal-only builds ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: Build_Release_x86: _BuildConfig: Release _BuildArchitecture: x86 _DOTNET_CLI_UI_LANGUAGE: '' - _DropSuffix: '' # Always run builds Build_Release_x64: _BuildConfig: Release _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: '' - _DropSuffix: '' _AdditionalBuildParameters: '/p:PublishInternalAsset=true /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1) /p:DotNetPublishBlobFeedUrl=$(_ArcadePublishBlobFeedUrl)' @@ -77,7 +68,6 @@ stages: _BuildConfig: Release _BuildArchitecture: arm _DOTNET_CLI_UI_LANGUAGE: '' - _DropSuffix: '' - template: /eng/build.yml parameters: @@ -94,77 +84,54 @@ stages: _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Ubuntu_18_04_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker ubuntu.18.04' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Fedora_29_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker fedora.29' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - _DropSuffix: '' Build_CentOS_7_1_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker centos' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Debian_Stretch_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker debian' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Rhel_7_2_Release_x64: _BuildConfig: Release _DockerParameter: '--docker rhel' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Arm_Debug: _BuildConfig: Debug _DockerParameter: '' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm' _BuildArchitecture: 'arm' - _DropSuffix: '' Build_Arm64_Debug: _BuildConfig: Debug _DockerParameter: '' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' - _DropSuffix: '' Build_Linux_musl_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker alpine.3.6' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-musl-x64' _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_LinuxPortable_NoSuffix_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: true - Build_Arm_NoSuffix_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - _DropSuffix: true ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: Build_Arm_Release: _BuildConfig: Release @@ -172,28 +139,24 @@ stages: _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm' _BuildArchitecture: 'arm' - _DropSuffix: '' Build_Arm64_Release: _BuildConfig: Release _DockerParameter: '' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' - _DropSuffix: '' Build_Linux_musl_Release_x64: _BuildConfig: Release _DockerParameter: '--docker alpine.3.6' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-musl-x64' _BuildArchitecture: 'x64' - _DropSuffix: '' Build_Linux_Portable_Deb_Release_x64: _BuildConfig: Release _DockerParameter: '--docker ubuntu.16.04' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - _DropSuffix: '' # Do not publish zips and tarballs. The linux-x64 binaries are # already published by Build_LinuxPortable_Release_x64 _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' @@ -203,7 +166,6 @@ stages: _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - _DropSuffix: '' # Do not publish zips and tarballs. The linux-x64 binaries are # already published by Build_LinuxPortable_Release_x64 _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' @@ -213,7 +175,6 @@ stages: _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - _DropSuffix: '' - template: /eng/build.yml parameters: diff --git a/eng/Publishing.props b/eng/Publishing.props index 6626f263b..deb6ab38d 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -1,9 +1,6 @@ - - - Sdk $(Product) @@ -56,19 +53,18 @@ - - - $(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(SdkVersion)' ,'$(FullNuGetVersion)')) + + + $(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)')) - - $(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(SdkVersion)' ,'$(FullNuGetVersion)')) + + $(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)')) @@ -103,7 +99,7 @@ NonShipping=true - + $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) NonShipping=true diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97ed8b972..102b1d87c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 8ec04f1df35d014eb9a6352ed74125e4d97fc8e0 + 780f26a116f0dce23207efba4ff348e747203604 - + https://github.com/dotnet/windowsdesktop - 8ec04f1df35d014eb9a6352ed74125e4d97fc8e0 + 780f26a116f0dce23207efba4ff348e747203604 - + https://github.com/dotnet/windowsdesktop - 8ec04f1df35d014eb9a6352ed74125e4d97fc8e0 + 780f26a116f0dce23207efba4ff348e747203604 https://github.com/dotnet/runtime @@ -43,58 +43,58 @@ https://github.com/dotnet/runtime c07be36e3ce00b06e99d02669fd658a813cdce11 - + https://github.com/aspnet/AspNetCore - 27314f478aac87f3fd09f94ccd9b83f738da6ab1 + c17ce436b8703470231e7979cead042f5682c3f5 - + https://github.com/aspnet/AspNetCore - 27314f478aac87f3fd09f94ccd9b83f738da6ab1 + c17ce436b8703470231e7979cead042f5682c3f5 - + https://github.com/aspnet/AspNetCore - 27314f478aac87f3fd09f94ccd9b83f738da6ab1 + c17ce436b8703470231e7979cead042f5682c3f5 - + https://github.com/aspnet/AspNetCore - 27314f478aac87f3fd09f94ccd9b83f738da6ab1 + c17ce436b8703470231e7979cead042f5682c3f5 - + https://github.com/aspnet/AspNetCore - 27314f478aac87f3fd09f94ccd9b83f738da6ab1 + c17ce436b8703470231e7979cead042f5682c3f5 - + https://github.com/aspnet/AspNetCore - 27314f478aac87f3fd09f94ccd9b83f738da6ab1 + c17ce436b8703470231e7979cead042f5682c3f5 https://github.com/dotnet/test-templates 5117d3d9d7dfd3583f0c42a639efaf092f957b7b - + https://github.com/dotnet/templating - dcf5adbd4b5665887f22ad19592dedfb9f1e1b68 + 5f229bd53bd6677911b49a681c469150df76004d - + https://github.com/dotnet/toolset - 52ad01255b30c157c5fbea985d4cd0834d1fc9fb + 3a3107cc57b1b784f30bb17326000751d6168df4 - + https://github.com/dotnet/sdk - 419501cb5731805c7e49bae276a2938e7c1844de + d255a0eb68724f407517dd1ff6d22fedae305c7c - + https://github.com/dotnet/toolset - 52ad01255b30c157c5fbea985d4cd0834d1fc9fb + 3a3107cc57b1b784f30bb17326000751d6168df4 - + https://github.com/dotnet/winforms - 1f4dab10474a75c7a5068dd6997caedc27d93092 + fc97b5f1034666241284e23cbb39b95dc64d0615 - + https://github.com/dotnet/wpf - 9c1df82fc3619906bb21e89cbc39d0ac9bcd68dc + fd5ec61aa74162f9db115ec24b80fb75b96f069a @@ -104,9 +104,9 @@ - + https://github.com/dotnet/arcade - 4736ddca60a4040447b450437cf3767c9045edc0 + d0833c8e5e58cfc507ce3c8da364e55931190263 diff --git a/eng/Versions.props b/eng/Versions.props index ca16ce81c..7b087b34b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,28 +4,33 @@ true - - 1.0.0 - preview + 5 + 0 + 1 + 00 + $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) + alpha + 1 + $(VersionMajor).$(VersionMinor) + $(MajorMinorVersion).$(VersionSDKMinor) + $(VersionPrefix)-$(PreReleaseVersionLabel)$(PreReleaseVersionIteration)-$(_BuildNumberLabels) - 5.0.100-alpha.1.19567.1 + 5.0.100-alpha.1.20058.5 - 5.0.0-alpha1.19618.9 + 5.0.0-alpha1.20051.15 - 5.0.0-alpha.1.19618.7 + 5.0.0-alpha.1.20058.1 - 5.0.0-alpha1.19566.1 + 5.0.0-alpha1.20058.1 @@ -37,23 +42,23 @@ - 5.0.0-alpha.1.19618.1 - 5.0.0-alpha.1.19618.1 - 5.0.0-alpha.1.19618.1 - 5.0.0-alpha.1.19618.1 - 5.0.0-alpha.1.19618.1 - 5.0.0-alpha.1.19618.1 + 5.0.0-alpha.1.20056.6 + 5.0.0-alpha.1.20056.6 + 5.0.0-alpha.1.20056.6 + 5.0.0-alpha.1.20056.6 + 5.0.0-alpha.1.20056.6 + 5.0.0-alpha.1.20056.6 - 5.0.100-alpha.1.19567.1 + 5.0.100-alpha.1.20058.5 0.2.0 - 5.0.100-alpha1.19501.2 + 5.0.100-alpha.1.20051.2 $(MicrosoftNETSdkPackageVersion) @@ -71,9 +76,9 @@ - 5.0.0-alpha.1.19618.8 - 5.0.0-alpha.1.19618.8 - 5.0.0-alpha.1.19618.8 + 5.0.0-alpha.1.20058.1 + 5.0.0-alpha.1.20058.1 + 5.0.0-alpha.1.20058.1 diff --git a/eng/build.yml b/eng/build.yml index 750111576..1395a9d04 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -84,7 +84,6 @@ phases: displayName: Build env: DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) - DropSuffix: $(_DropSuffix) DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: @@ -104,7 +103,6 @@ phases: $(_AdditionalBuildParameters) displayName: Build env: - DropSuffix: $(_DropSuffix) DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index c3c473eb8..a5a1e711d 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("value", $Password) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." @@ -123,21 +123,19 @@ if ($creds -eq $null) { $doc.DocumentElement.AppendChild($creds) | Out-Null } -$userName = "dn-bot" - # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password $dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") if ($dotnet3Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password } $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password } $doc.Save($filename) diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 6a4ab7f53..700211049 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -29,21 +29,16 @@ stages: pool: vmImage: 'windows-2019' steps: - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' + displayName: Download Build Assets continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts inputs: - artifactName: 'PDBArtifacts' - continueOnError: true + buildType: 'current' + downloadType: 'specific' + itemPattern: | + PDBArtifacts/** + BlobArtifacts/** + downloadPath: '$(Build.ArtifactStagingDirectory)' # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here @@ -89,23 +84,16 @@ stages: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts + displayName: Download Build Assets continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts inputs: - buildType: current - artifactName: BlobArtifacts - continueOnError: true - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests + buildType: 'current' + downloadType: 'specific' + itemPattern: | + PackageArtifacts/** + BlobArtifacts/** + AssetManifests/** + downloadPath: '$(Build.ArtifactStagingDirectory)' - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index 3f572f8b1..fbb5a19b6 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -30,16 +30,15 @@ stages: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' + displayName: Download Build Assets continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts inputs: - artifactName: 'PDBArtifacts' - continueOnError: true + buildType: 'current' + downloadType: 'specific' + itemPattern: | + PDBArtifacts/** + BlobArtifacts/** + downloadPath: '$(Build.ArtifactStagingDirectory)' # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here @@ -84,24 +83,16 @@ stages: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts + displayName: Download Build Assets continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts inputs: - buildType: current - artifactName: BlobArtifacts - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests + buildType: 'current' + downloadType: 'specific' + itemPattern: | + PackageArtifacts/** + BlobArtifacts/** + AssetManifests/** + downloadPath: '$(Build.ArtifactStagingDirectory)' - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 70a5b6f8a..8a8d84f20 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -54,12 +54,6 @@ stages: pool: vmImage: 'windows-2019' steps: - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: diff --git a/global.json b/global.json index edf37db57..8e64b4176 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "tools": { - "dotnet": "5.0.100-alpha1-014915" + "dotnet": "5.0.100-alpha1-015949" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19616.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20057.5" } } diff --git a/src/CopyToLatest/CopyToLatest.csproj b/src/CopyToLatest/CopyToLatest.csproj index 9e7c7d5af..84dad6aaf 100644 --- a/src/CopyToLatest/CopyToLatest.csproj +++ b/src/CopyToLatest/CopyToLatest.csproj @@ -8,7 +8,6 @@ - diff --git a/src/CopyToLatest/targets/FinishBuild.targets b/src/CopyToLatest/targets/FinishBuild.targets index 2fb9a3d5a..523b80870 100644 --- a/src/CopyToLatest/targets/FinishBuild.targets +++ b/src/CopyToLatest/targets/FinishBuild.targets @@ -1,7 +1,6 @@ 6 bits // CLI minor -> 6 bits // CLI patch -> 6 bits - // CLI commitcount -> 14 bits + // CLI VersionRevision -> 14 bits var major = Major << 26; var minor = Minor << 20; var patch = Patch << 14; - var msiVersionNumber = major | minor | patch | CommitCount; + var msiVersionNumber = major | minor | patch | VersionRevision; var msiMajor = (msiVersionNumber >> 24) & 0xFF; var msiMinor = (msiVersionNumber >> 16) & 0xFF; diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 8792e3898..f1ab93144 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -21,7 +21,6 @@ - diff --git a/src/redist/targets/Badge.targets b/src/redist/targets/Badge.targets index 8e9ccc4ac..e6491fe53 100644 --- a/src/redist/targets/Badge.targets +++ b/src/redist/targets/Badge.targets @@ -13,7 +13,7 @@ InputFiles="$(VersionSvgTemplate)" DestinationFiles="$(VersionBadge)" ReplacementPatterns="ver_number" - ReplacementStrings="$(SdkVersion)" /> + ReplacementStrings="$(Version)" /> diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index 44174a784..d7fbc6051 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -1,9 +1,9 @@ - + cli - Microsoft .NET Core SDK $(CliBrandingVersion) - Microsoft .NET Core Toolset $(CliBrandingVersion) + Microsoft .NET Core SDK $(Version) + Microsoft .NET Core Toolset $(Version) .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimePackageVersion) Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion) @@ -13,10 +13,10 @@ Microsoft .NET Core Host FX Resolver $(HostFxrVersion) Microsoft.NETCore.App $(SharedFrameworkName) - Microsoft .NET Core 3.1 Templates $(CliBrandingVersion) - Microsoft .NET Core 3.0 Templates $(CliBrandingVersion) - Microsoft .NET Core 2.2 Templates $(CliBrandingVersion) - Microsoft .NET Core 2.1 Templates $(CliBrandingVersion) + Microsoft .NET Core 3.1 Templates $(Version) + Microsoft .NET Core 3.0 Templates $(Version) + Microsoft .NET Core 2.2 Templates $(Version) + Microsoft .NET Core 2.1 Templates $(Version) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 3f1965390..553bca59c 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -1,11 +1,10 @@ - + $(AspNetCorePackageVersionFor31Templates.IndexOf('-')) $(AspNetCorePackageVersionFor31Templates) $(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator))) - $(AspNetCore31VersionMajorMinorPatchVersion).$(GitCommitCount) + $(AspNetCore31VersionMajorMinorPatchVersion).$(CombinedBuildNumberAndRevision) $(AspNetCore31VersionMajorMinorPatchVersion) $(BundledTemplates31InstallPath)-$(VersionSuffix) $([MSBuild]::Add($(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.')), 1)) @@ -15,7 +14,7 @@ $(AspNetCorePackageVersionFor30Templates.IndexOf('-')) $(AspNetCorePackageVersionFor30Templates) $(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator))) - $(AspNetCore30VersionMajorMinorPatchVersion).$(GitCommitCount) + $(AspNetCore30VersionMajorMinorPatchVersion).$(CombinedBuildNumberAndRevision) $(AspNetCore30VersionMajorMinorPatchVersion) $(BundledTemplates30InstallPath)-$(VersionSuffix) $([MSBuild]::Add($(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.')), 1)) @@ -25,7 +24,7 @@ $(AspNetCorePackageVersionFor22Templates.IndexOf('-')) $(AspNetCorePackageVersionFor22Templates) $(AspNetCorePackageVersionFor22Templates.Substring(0, $(AspNetCore22VersionPreReleaseSeparator))) - $(AspNetCore22VersionMajorMinorPatchVersion).$(GitCommitCount) + $(AspNetCore22VersionMajorMinorPatchVersion).$(CombinedBuildNumberAndRevision) $(AspNetCore22VersionMajorMinorPatchVersion) $(BundledTemplates22InstallPath)-$(VersionSuffix) $([MSBuild]::Add($(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.')), 1)) @@ -35,7 +34,7 @@ $(AspNetCorePackageVersionFor21Templates.IndexOf('-')) $(AspNetCorePackageVersionFor21Templates) $(AspNetCorePackageVersionFor21Templates.Substring(0, $(AspNetCore21VersionPreReleaseSeparator))) - $(AspNetCore21VersionMajorMinorPatchVersion).$(GitCommitCount) + $(AspNetCore21VersionMajorMinorPatchVersion).$(CombinedBuildNumberAndRevision) $(AspNetCore21VersionMajorMinorPatchVersion) $(BundledTemplates21InstallPath)-$(VersionSuffix) $([MSBuild]::Add($(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.')), 1)) diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 3fccba0e6..b0aa36fea 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -134,7 +134,7 @@ + DestinationFiles="@(PdbsToMove->'$(ArtifactsSymStoreDirectory)/sdk/$(Version)/%(RecursiveDir)%(Filename)%(Extension)')" /> $(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) - <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DropSuffix)' != 'true' ">true - <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DropSuffix)' == 'true' ">false + <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DotNetFinalVersionKind)' != 'release' ">true + <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false @@ -157,7 +157,7 @@ Copyright (c) .NET Foundation. All rights reserved. $(_NETStandardLibraryPackageVersion) $(_NETCorePlatformsPackageVersion) %24(MSBuildThisFileDirectory)RuntimeIdentifierGraph.json - $(SdkVersion) + $(Version) $(ProductMonikerRid) <_NETCoreSdkIsPreview>$(_NETCoreSdkBeingBuiltIsPreview) diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets index 2dc31606b..3a9cd6452 100644 --- a/src/redist/targets/GenerateDebs.targets +++ b/src/redist/targets/GenerateDebs.targets @@ -7,8 +7,7 @@ @@ -172,7 +171,7 @@ $(AspNetCoreRefVersionWithTilde) - $(SdkVersion) + $(Version) @@ -264,7 +263,7 @@ diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index d0e6b7bcf..bf6fd0c5b 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -22,9 +22,9 @@ 3.0.0 - + - $(RedistLayoutPath)sdk\$(SdkVersion)\ + $(RedistLayoutPath)sdk\$(Version)\ true https://dotnetclimsrc.blob.core.windows.net/dotnet/ @@ -230,7 +230,7 @@ $(DotnetToolsetBlobRootUrl)Toolset/$(MicrosoftDotnetToolsetInternalPackageVersion) dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip - sdk/$(SdkVersion) + sdk/$(Version) @@ -405,7 +405,7 @@ "version": "$(MicrosoftNETCoreAppRuntimePackageVersion)" - + - + + + + + @@ -497,11 +503,11 @@ - + + DestinationFiles="@(SdkInternalFiles -> '$(SdkInternalLayoutPath)sdk\$(Version)\%(RecursiveDir)%(Filename)%(Extension)')"/> diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index c73470943..3124f7021 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -54,19 +54,38 @@ $(LayoutDirectory)$(ArtifactNameSdk) $(LayoutDirectory)MSBuildExtensions--> + + + + + + + + + $(GitCommitCount.PadLeft(6,'0')) + + + $(_PatchNumber) + + $(GitCommitCount) + $(VersionPrefix).$(CombinedBuildNumberAndRevision) + + DependsOnTargets="GenerateLayout;SetupWixProperties"> - + VersionPatch="$(VersionFeature)"> @@ -144,7 +163,7 @@ '$(ToolsetBrandName)' ^ '$(MsiVersion)' ^ '$(SDKBundleVersion)' ^ - '$(NugetVersion)' ^ + '$(Version)' ^ '$(SdkInstallerUpgradeCode)' ^ '$(SdkDependencyKeyName)' ^ '$(Architecture)' ^ @@ -164,7 +183,7 @@ '$(SdkBrandName)' ^ '$(MsiVersion)' ^ '$(SDKBundleVersion)' ^ - '$(NugetVersion)' ^ + '$(Version)' ^ '$(SdkPlaceholderInstallerUpgradeCode)' ^ '$(SdkPlaceholderDependencyKeyName)' ^ '$(Architecture)' ^ @@ -264,7 +283,7 @@ '$(SdkBrandName)' ^ '$(MsiVersion)' ^ '$(SDKBundleVersion)' ^ - '$(NugetVersion)' ^ + '$(Version)' ^ '$(MicrosoftWindowsDesktopAppRuntimePackageVersion)' ^ '$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^ '$(SdkDependencyKeyName)' ^ diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets index 1234883a7..d5b8af944 100644 --- a/src/redist/targets/GeneratePKG.targets +++ b/src/redist/targets/GeneratePKG.targets @@ -1,7 +1,7 @@ - + - $(IntermediateOutputPath)pkgs/$(SdkVersion) + $(IntermediateOutputPath)pkgs/$(Version) com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.x64 @@ -10,8 +10,8 @@ com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppRefPackageVersion).component.osx.x64 com.microsoft.dotnet.pack.apphost.$(MicrosoftNETCoreAppHostPackageVersion).component.osx.x64 com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.x64 - com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64 - com.microsoft.dotnet.dev.$(SdkVersion).osx.x64 + com.microsoft.dotnet.dev.$(Version).component.osx.x64 + com.microsoft.dotnet.dev.$(Version).osx.x64 /usr/local/share/dotnet @@ -62,7 +62,7 @@ $(SdkComponentId) - $(SdkVersion) + $(Version) $(SdkBrandName) @@ -87,11 +87,11 @@ - $(SdkVersion) + $(Version) - $(SdkVersion) + $(Version) $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -162,7 +162,7 @@ @@ -201,7 +201,7 @@ ReplacementStrings="@(DistributionTemplateReplacement -> '%(ReplacementString)')" /> - $(SdkVersion) + $(Version) $(SdkBrandName) @@ -121,7 +121,7 @@ - $(SdkVersion) + $(Version) @@ -175,11 +175,11 @@ + DependsOnTargets="CalculateLinuxNativeInstallerDependencyVersions;GetCurrentRuntimeInformation;SetupFileExtensions"> $(MajorMinorVersion) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkRpmPackageVersion) - $(SdkVersion) + $(Version) $(RedistLayoutPath)sdk/ $(RedistLayoutPath)templates/ $(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 6e010c5ce..f417fa7b1 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -1,5 +1,5 @@ - + @@ -39,13 +39,13 @@ dotnet-sdk-internal dotnet-sdk - $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid) - dotnet-standard-support-vs2015-$(SdkVersion)-$(ProductMonikerRid) - $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid) + $(ArtifactNameSdk)-$(Version)-$(ProductMonikerRid) + dotnet-standard-support-vs2015-$(Version)-$(ProductMonikerRid) + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(ProductMonikerRid) Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid) - $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)- + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)- $(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdkWithoutHostMonikerRid)$(HostMonikerRidForFileName) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets deleted file mode 100644 index 0a5653a1e..000000000 --- a/src/redist/targets/Versions.targets +++ /dev/null @@ -1,55 +0,0 @@ - - - 5 - 0 - 1 - 00 - alpha1 - - false - - - - - - - - - - - - - $(GitCommitCount.PadLeft(6,'0')) - - - - - - $(VersionMajor).$(VersionMinor) - $(MajorMinorVersion).$(VersionSDKMinor) - $(CliProductBandVersion)$(VersionPatch) - $(CliVersionNoSuffix)-$(ReleaseSuffix) - $(CliVersionNoSuffix) - $(ReleaseSuffix) - $(CliVersionNoSuffix) - $(CliVersionNoSuffix).$(GitCommitCount) - - $(ReleaseSuffix)-$(GitCommitCount) - - $(CliVersionNoSuffix)-$(ReleaseSuffix)-$(GitCommitCount) - - $(FullNugetVersion) - $(CliVersionNoSuffix) - - $(NugetVersion) - $(NugetVersion) - - - - - diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index ab3558dc8..e0080792f 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -99,15 +99,15 @@ namespace EndToEnd.Tests } [WindowsOnlyTheory] - [InlineData("wpf")] - [InlineData("winforms")] + [InlineData("wpf", Skip = "https://github.com/dotnet/wpf/issues/2363")] + [InlineData("winforms", Skip = "https://github.com/dotnet/wpf/issues/2363")] public void ItCanBuildDesktopTemplates(string templateName) { TestTemplateBuild(templateName); } [WindowsOnlyTheory] - [InlineData("wpf")] + [InlineData("wpf", Skip = "https://github.com/dotnet/wpf/issues/2363")] public void ItCanBuildDesktopTemplatesSelfContained(string templateName) { TestTemplateBuild(templateName); diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 441cc6cc7..19948f4dd 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -169,5 +169,9 @@ Issue="" Reason="Assumes netcoreapp3.1 targeting pack is bundled, which it is not in 5.0 SDK. Will resolve when sdk takes newer stage 0 and hits same issue."/> +