diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 69f7c6d6d..ba1891246 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -262,6 +262,7 @@ stages: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: + publishingInfraVersion: 3 enableSymbolValidation: false enableSigningValidation: false enableNugetValidation: false diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props new file mode 100644 index 000000000..cb76746e4 --- /dev/null +++ b/eng/ManualVersions.props @@ -0,0 +1,16 @@ + + + + + + 10.0.17763.3-preview + 10.0.18362.4-preview + 10.0.19041.3-preview + + diff --git a/eng/Publishing.props b/eng/Publishing.props index 99e07962f..9520cf240 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -1,6 +1,10 @@ + + 3 + + Sdk $(Product) @@ -99,30 +103,6 @@ PropertyName="FullNugetVersion"/> - - - - $(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)')) - - - $(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)')) - - - - - - - - - - @@ -137,36 +117,28 @@ $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) - - - $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) - NonShipping=true - - - - $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) - NonShipping=true - + PublishFlatContainer="true" + PublishingVersion="3"/> + PublishFlatContainer="true" + PublishingVersion="3"/> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1df953ad8..97037f297 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 85186023c8de8237268033cadc41d738b7f2005e + bc1c3f252a60f9887bd55b67a2c585e8cf83300e - + https://github.com/dotnet/windowsdesktop - 85186023c8de8237268033cadc41d738b7f2005e + bc1c3f252a60f9887bd55b67a2c585e8cf83300e - + https://github.com/dotnet/windowsdesktop - 85186023c8de8237268033cadc41d738b7f2005e + bc1c3f252a60f9887bd55b67a2c585e8cf83300e https://github.com/dotnet/runtime @@ -43,29 +43,33 @@ https://github.com/dotnet/runtime a820ca1c4f9cb5892331e2624d3999c39161fe2a - + https://github.com/dotnet/aspnetcore - b98b74a59c3a6b0466015bc3d00485ac83540d92 + 8d8d293b192d38a4cc8d2e13d944936402d20e7f - + https://github.com/dotnet/aspnetcore - b98b74a59c3a6b0466015bc3d00485ac83540d92 + 8d8d293b192d38a4cc8d2e13d944936402d20e7f - + https://github.com/dotnet/aspnetcore - b98b74a59c3a6b0466015bc3d00485ac83540d92 + 8d8d293b192d38a4cc8d2e13d944936402d20e7f - + https://github.com/dotnet/aspnetcore - b98b74a59c3a6b0466015bc3d00485ac83540d92 + 8d8d293b192d38a4cc8d2e13d944936402d20e7f - + https://github.com/dotnet/aspnetcore - b98b74a59c3a6b0466015bc3d00485ac83540d92 + 8d8d293b192d38a4cc8d2e13d944936402d20e7f - + https://github.com/dotnet/aspnetcore - b98b74a59c3a6b0466015bc3d00485ac83540d92 + 8d8d293b192d38a4cc8d2e13d944936402d20e7f + + + https://github.com/dotnet/aspnetcore + 8d8d293b192d38a4cc8d2e13d944936402d20e7f https://github.com/dotnet/test-templates @@ -88,23 +92,73 @@ dca8aadaf063ac18f8c19e038a973591d526fbf5 - + https://github.com/dotnet/winforms - b014c89fafff342c92c27968f8231b5032b12954 + 5e62c5676f7370ae1d682cf44cf285cf781610fb - + https://github.com/dotnet/wpf - b91ba697c48bc7825580e3c7fa09c5c3781c3788 + b2f9f821159d07d87a6ff0b7f488d1927d2f0fff + + + https://github.com/dotnet/fsharp + 03283e07f6bd5717797acb288cf6044cedca2202 + + + https://github.com/microsoft/vstest + 2418d9ec492e93245e1ce8699d6ae9cd7b86649b + + + https://github.com/mono/linker + 6d26f7ac409c5723bca669385e65582e69b4da75 + linker + + + https://github.com/dotnet/roslyn + 6791eb21f5219b7e2c5e938044ef841abc1de553 + + + https://github.com/dotnet/msbuild + 250161603c003af239d6e276c4fc6357586ba301 + + + https://github.com/NuGet/NuGet.Client + 0e5413751caebf168e7d363c88b9c22a3560fe60 + + + https://github.com/dotnet/cliCommandLineParser + 0e89c2116ad28e404ba56c14d1c3f938caa25a01 + + + https://github.com/Microsoft/ApplicationInsights-dotnet + 53b80940842204f78708a538628288ff5d741a1d + + + + https://github.com/aspnet/xdt + c01a538851a8ab1a1fbeb2e6243f391fff7587b4 - + https://github.com/dotnet/arcade - 06ad7cf82dbf56b3facf8a7d3a00944f5116663d + 0365488709f58e37de6c2180e7fb243203ca0a9c - + https://github.com/dotnet/arcade - 06ad7cf82dbf56b3facf8a7d3a00944f5116663d + 0365488709f58e37de6c2180e7fb243203ca0a9c + + + https://github.com/dotnet/source-build-reference-packages + 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 + + + https://github.com/dotnet/sourcelink + 8a3edd1902dbfe3adba65f22e3bb7aa2cc73e97f + + + https://github.com/dotnet/xliff-tasks + 975065e08307a459dc2649b1c852f5c4cafd2f91 diff --git a/eng/Versions.props b/eng/Versions.props index f5b66826e..e688ee443 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,6 +14,9 @@ 1 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) + + false + release @@ -21,15 +24,15 @@ - 5.0.0-rc.1.20417.1 + 5.0.0-rc.2.20473.8 - 5.0.0-rc.1.20417.3 + 5.0.0-rc.2.20474.1 - 6.0.0-alpha.1.20471.4 + 5.0.0-rc.2.20474.2 @@ -41,41 +44,43 @@ - 5.0.0-rc.2.20466.8 - 5.0.0-rc.2.20466.8 - 5.0.0-rc.2.20466.8 - 5.0.0-rc.2.20466.8 - 5.0.0-rc.2.20466.8 - 5.0.0-rc.2.20466.8 + 5.0.0-rc.2.20474.4 + 5.0.0-rc.2.20474.4 + 5.0.0-rc.2.20474.4 + 5.0.0-rc.2.20474.4 + 5.0.0-rc.2.20474.4 + 5.0.0-rc.2.20474.4 + 5.0.0-rc.2.20474.4 0.2.0 - 6.0.100-alpha.1.20471.13 - 6.0.100-alpha.1.20471.13 + 5.0.100-rc.2.20474.17 + 5.0.100-rc.2.20474.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) + $(MicrosoftNETSdkPackageVersion) - 6.0.0-alpha.1.20468.7 + 5.0.0-rc.2.20474.5 - 6.0.0-alpha.1.20468.7 - 6.0.0-alpha.1.20468.7 - 6.0.0-alpha.1.20468.7 - 6.0.0-alpha.1.20468.7 - 6.0.0-alpha.1.20468.7 + 5.0.0-rc.2.20474.5 + 5.0.0-rc.2.20474.5 + 5.0.0-rc.2.20474.5 + 5.0.0-rc.2.20474.5 + 5.0.0-rc.2.20474.5 2.1.0 - 5.0.0-rc.1.20417.4 - 5.0.0-rc.1.20417.4 - 5.0.0-rc.1.20417.4 + 5.0.0-rc.2.20474.5 + 5.0.0-rc.2.20474.5 + 5.0.0-rc.2.20474.5 @@ -105,6 +110,7 @@ $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) 3.1.7 + 3.2.1 4.8.0-rc2.19462.10 3.0.0 @@ -118,21 +124,17 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.14 + 2.1.22 2.2.0-beta.19072.10 2.0.0 - 15.8.0 - - - 10.0.17763.1-preview - 10.0.18362.2-preview - 10.0.19041.1-preview + 16.8.0-release-20200924-01 2.0.1-servicing-26011-01 + diff --git a/eng/build.yml b/eng/build.yml index b4e2a751b..1293e3764 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -123,7 +123,7 @@ phases: env: DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT')) }}: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT'), ne(variables['PostBuildSign'], 'true')) }}: - task: NuGetCommand@2 displayName: Push Visual Studio NuPkgs inputs: diff --git a/src/VSTemplateLocator/VSTemplateLocator.csproj b/src/VSTemplateLocator/VSTemplateLocator.csproj new file mode 100644 index 000000000..348b13fb5 --- /dev/null +++ b/src/VSTemplateLocator/VSTemplateLocator.csproj @@ -0,0 +1,39 @@ + + + + $(CoreSdkTargetFramework) + false + false + false + false + UNUSED + true + + + + + + + + + + + + + + + + <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> + <_VSTemplateLocatorSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_VSTemplateLocatorSrc Include="$(Pkgmicrosoft_dotnet_templateLocator)\lib\net472\**\*.dll" Arch="" /> + <_VSTemplateLocatorDst Include="@(_VSTemplateLocatorSrc->'$(OutputPath)VSTemplateLocator\%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> + + + + + + diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs index b133ea29c..ed392ed4a 100644 --- a/src/core-sdk-tasks/CalculateTemplateVersions.cs +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -12,9 +12,6 @@ namespace Microsoft.DotNet.Cli.Build [Required] public string AspNetCorePackageVersionTemplate { get; set; } - [Required] - public string VersionSuffix { get; set; } - [Output] public string BundledTemplateInstallPath { get; set; } @@ -28,7 +25,7 @@ namespace Microsoft.DotNet.Cli.Build public override bool Execute() { - var result = Calculate(AspNetCorePackageVersionTemplate, VersionSuffix); + var result = Calculate(AspNetCorePackageVersionTemplate); BundledTemplateInstallPath = result.BundledTemplateInstallPath; BundledTemplateMajorMinorVersion = result.BundledTemplateMajorMinorVersion; BundledTemplateMajorMinorPatchVersion = result.BundledTemplateMajorMinorPatchVersion; @@ -40,16 +37,14 @@ namespace Microsoft.DotNet.Cli.Build (string BundledTemplateInstallPath, string BundledTemplateMajorMinorVersion, string BundledTemplateMajorMinorPatchVersion) - Calculate( - string aspNetCorePackageVersionTemplate, - string versionSuffix) + Calculate(string aspNetCorePackageVersionTemplate) { var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate); NuGetVersion baseMajorMinorPatch = GetBaseMajorMinorPatch(aspNetCoreTemplate); string bundledTemplateInstallPath = aspNetCoreTemplate.IsPrerelease - ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{versionSuffix}" + ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{aspNetCoreTemplate.Release}" : $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}"; return ( diff --git a/src/core-sdk-tasks/ReplaceFileContents.cs b/src/core-sdk-tasks/ReplaceFileContents.cs index 130550aba..671b73674 100644 --- a/src/core-sdk-tasks/ReplaceFileContents.cs +++ b/src/core-sdk-tasks/ReplaceFileContents.cs @@ -12,18 +12,18 @@ namespace Microsoft.DotNet.Cli.Build { /// /// Reads contents of an input file, and searches for each replacement passed in. - /// + /// /// When ReplacementItems is matched, it will replace the Include/ItemSpec with the corresponding /// ReplacementString metadata value. This can be useful if the ReplacementString is a value that /// cannot be represented by ITaskItem.ItemSpec (like string.Empty). - /// - /// When a ReplacementPattern is matched it will replace it with the string of the corresponding (by index) + /// + /// When a ReplacementPattern is matched it will replace it with the string of the corresponding (by index) /// item in ReplacementStrings. - /// - /// For example, if 2 ReplacementPatterns are passed in, 2 ReplacementStrings must also passed in and the first + /// + /// For example, if 2 ReplacementPatterns are passed in, 2 ReplacementStrings must also passed in and the first /// pattern will be replaced with the first string, and the second pattern replaced with the second string. - /// - /// ReplacementPattern could easily be a regex, but it isn't needed for current use cases, so leaving this + /// + /// ReplacementPattern could easily be a regex, but it isn't needed for current use cases, so leaving this /// as just a string that will be replaced. /// public class ReplaceFileContents : Task @@ -40,6 +40,11 @@ namespace Microsoft.DotNet.Cli.Build public ITaskItem[] ReplacementStrings { get; set; } + /// + /// Gets or sets a string that a file must contain for the replacement to be performed. + /// + public string FileMustContainText { get; set; } + public override bool Execute() { if (ReplacementItems == null && ReplacementPatterns == null && ReplacementStrings == null) @@ -81,6 +86,12 @@ namespace Microsoft.DotNet.Cli.Build public void ReplaceContents(string inputFile, string destinationFile) { string inputFileText = File.ReadAllText(inputFile); + if (!string.IsNullOrEmpty(FileMustContainText) && !inputFileText.Contains(FileMustContainText)) + { + Log.LogMessage(MessageImportance.Low, $"Skipping replacement on `{inputFile}` because it does not contain the text '{FileMustContainText}'."); + return; + } + string outputFileText = ReplacePatterns(inputFileText); WriteOutputFile(destinationFile, outputFileText); diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 35c3d4ad9..852ba97c1 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -3,6 +3,7 @@ $(CoreSdkTargetFramework) true false + false @@ -12,6 +13,7 @@ /> + diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index b32bd497c..00a31f8a3 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -1,29 +1,25 @@ - + - + - + - + @@ -70,6 +66,7 @@ + @@ -183,7 +180,7 @@ + Condition="$(ProductMonikerRid.StartsWith('win')) And '$(Architecture)' != 'arm'"> diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index cc81a3f58..91a04a34b 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -71,7 +71,7 @@ - + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 031cce670..9a3fe30eb 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -108,14 +108,12 @@ - + + - - $(CoreSetupBlobVersion) - $(AspNetCoreBlobVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) $(WindowsDesktopBlobVersion) 3.0.0 @@ -78,10 +78,11 @@ x64 aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) @@ -167,29 +168,30 @@ + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedSharedFrameworkInstallerFileName) + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedSharedHostInstallerFileName) + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedHostFxrInstallerFileName) + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion) $(DownloadedNetCoreAppTargetingPackInstallerFileName) + $(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion) @@ -198,7 +200,7 @@ + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedNetCoreAppHostPackInstallerFileName) @@ -251,19 +253,19 @@ + Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion) $(DownloadedAspNetTargetingPackInstallerFileName) + Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(DownloadedAspNetCoreSharedFxInstallerFileName) + Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(DownloadedAspNetCoreSharedFxWixLibFileName) @@ -275,7 +277,7 @@ + Condition="!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64'"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(AspNetCoreSharedFxBaseRuntimeVersionFileName) @@ -283,7 +285,7 @@ false - true + true false @@ -403,15 +405,27 @@ "version": ".*" "version": "$(MicrosoftNETCoreAppRuntimePackageVersion)" + "version": "$(MicrosoftAspNetCoreAppRuntimePackageVersion)" + + + ReplacementStrings="$(ReplacementString)" + FileMustContainText="Microsoft.NETCore.App" /> + + + - 3.10.4 + 3.14.0.4118 https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip @@ -46,6 +46,10 @@ $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr + $(ArtifactsDir)bin/VSTemplateLocator/Debug + $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$(FullNugetVersion).nupkg + $(ArtifactsObjDir)/LightCommandPackages @@ -243,7 +247,7 @@ @@ -291,6 +295,9 @@ $(Templates50InstallerUpgradeCode) NetCore_Templates_5.0 + + + $(Templates31LayoutPath.TrimEnd('\')) $(Templates31MSIInstallerFile) @@ -511,6 +518,23 @@ + + + + + + + GenerateSdkMSBuildExtensionsNupkg; + GenerateVSTemplateLocatorNupkg" + Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' " /> diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index a4d986179..c58bc2df8 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -113,6 +113,7 @@ $(SdkOutputDirectory)**/MSBuild.dll; $(SdkOutputDirectory)**/MSBuild.resources.dll; $(SdkOutputDirectory)**/PresentationBuildTasks.dll; + $(SdkOutputDirectory)**/redist.dll; $(SdkOutputDirectory)**/rzc.dll; $(SdkOutputDirectory)**/testhost.dll; $(SdkOutputDirectory)**/testhost.exe; @@ -183,10 +184,15 @@ + + + - + + + $(InternalCertificateId) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index c4a2914db..4e08d5063 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -1,7 +1,8 @@ - $(VersionPrefix)-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) + $(VersionPrefix)-$(PreReleaseVersionLabel) + $(FullNugetVersion).$(PreReleaseVersionIteration) $(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index 004138691..fd301d870 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -58,6 +58,21 @@ 此產品會收集使用方式資料 • 如需詳細資訊並退出，請前往 https://aka.ms/dotnet-cli-telemetry +資源 + • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs + • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs + • 如需版本資訊，請前往 https://aka.ms/dotnet5-release-notes + • 如需教學課程，請前往 https://aka.ms/dotnet-tutorials +安裝成功。 + +下列項目已安裝在: '[DOTNETHOME]' + • .NET SDK [DOTNETSDKVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + +此產品會收集使用方式資料 + • 如需詳細資訊並退出，請前往 https://aka.ms/dotnet-cli-telemetry + 資源 • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index d190f3138..d17c6fcc7 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -58,6 +58,21 @@ Do [DOTNETHOME] byly nainstalovány tyto součásti: Tento produkt shromažďuje data o využití. • Další informace a vyjádření výslovného nesouhlasu: https://aka.ms/dotnet-cli-telemetry +Zdroje informací + • Dokumentace k .NET : https://aka.ms/dotnet-docs + • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs + • Zpráva k vydání verze: https://aka.ms/dotnet5-release-notes + • Kurzy: https://aka.ms/dotnet-tutorials + Instalace proběhla úspěšně. + +Do [DOTNETHOME] byly nainstalovány tyto součásti: + • Sada .NET SDK [DOTNETSDKVERSION] + • Modul runtime .NET [DOTNETRUNTIMEVERSION] + • Modul runtime ASP.NET Core [ASPNETCOREVERSION] + +Tento produkt shromažďuje data o využití. + • Další informace a vyjádření výslovného nesouhlasu: https://aka.ms/dotnet-cli-telemetry + Zdroje informací • Dokumentace k .NET : https://aka.ms/dotnet-docs • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index fb193fb93..a197ee67a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -58,6 +58,21 @@ Folgende Komponenten wurden unter [DOTNETHOME] installiert: Dieses Produkt erfasst Nutzungsdaten. • Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry +Ressourcen + • .NET-Dokumentation: https://aka.ms/dotnet-docs + • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs + • Versionshinweise: https://aka.ms/dotnet5-release-notes + • Tutorials: https://aka.ms/dotnet-tutorials +Die Installation war erfolgreich. + +Folgende Komponenten wurden unter [DOTNETHOME] installiert: + • .NET SDK [DOTNETSDKVERSION] + • .NET-Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core-Runtime [ASPNETCOREVERSION] + +Dieses Produkt erfasst Nutzungsdaten. + • Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry + Ressourcen • .NET-Dokumentation: https://aka.ms/dotnet-docs • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl index 2e3e86df2..9944d6e4d 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl @@ -58,6 +58,21 @@ The following were installed at: '[DOTNETHOME]' This product collects usage data • More information and opt-out https://aka.ms/dotnet-cli-telemetry +Resources + • .NET Documentation https://aka.ms/dotnet-docs + • SDK Documentation https://aka.ms/dotnet-sdk-docs + • Release Notes https://aka.ms/dotnet5-release-notes + • Tutorials https://aka.ms/dotnet-tutorials +The installation was successful. + +The following were installed at: '[DOTNETHOME]' + • .NET SDK [DOTNETSDKVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + +This product collects usage data + • More information and opt-out https://aka.ms/dotnet-cli-telemetry + Resources • .NET Documentation https://aka.ms/dotnet-docs • SDK Documentation https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index 38cc06a3d..673804e94 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -58,6 +58,21 @@ Les éléments suivants ont été installés sur : '[DOTNETHOME]' Ce produit collecte des données d'utilisation • Plus informations et refus d'adhésion sur https://aka.ms/dotnet-cli-telemetry +Ressources + • Documentation .NET sur https://aka.ms/dotnet-docs + • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs + • Notes de publication sur https://aka.ms/dotnet5-release-notes + • Tutoriels sur https://aka.ms/dotnet-tutorials + L'installation a réussi. + +Les éléments suivants ont été installés sur : '[DOTNETHOME]' + • Kit SDK .NET [DOTNETSDKVERSION] + • Runtime .NET [DOTNETRUNTIMEVERSION] + • Runtime ASP.NET Core [ASPNETCOREVERSION] + +Ce produit collecte des données d'utilisation + • Plus informations et refus d'adhésion sur https://aka.ms/dotnet-cli-telemetry + Ressources • Documentation .NET sur https://aka.ms/dotnet-docs • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index 4e9dc4b4a..5c60d0246 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -58,6 +58,21 @@ I componenti seguenti sono stati installati in '[DOTNETHOME]' Questo prodotto consente di raccogliere i dati sull'utilizzo • Altre informazioni e annullamento sottoscrizione https://aka.ms/dotnet-cli-telemetry +Risorse + • Documentazione di .NET https://aka.ms/dotnet-docs + • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs + • Note sulla versione https://aka.ms/dotnet5-release-notes + • Esercitazioni https://aka.ms/dotnet-tutorials + L'installazione è riuscita. + +I componenti seguenti sono stati installati in '[DOTNETHOME]' + • .NET SDK [DOTNETSDKVERSION] + • Runtime di .NET [DOTNETRUNTIMEVERSION] + • Runtime di ASP.NET Core [ASPNETCOREVERSION] + +Questo prodotto consente di raccogliere i dati sull'utilizzo + • Altre informazioni e annullamento sottoscrizione https://aka.ms/dotnet-cli-telemetry + Risorse • Documentazione di .NET https://aka.ms/dotnet-docs • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 6bdfe68ff..36639d88a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -58,6 +58,21 @@ この製品は使用状況データを収集します • 詳細およびオプトアウト https://aka.ms/dotnet-cli-telemetry +リソース + • .NET ドキュメント https://aka.ms/dotnet-docs + • SDK ドキュメント https://aka.ms/dotnet-sdk-docs + • リリース ノート https://aka.ms/dotnet5-release-notes + • チュートリアル https://aka.ms/dotnet-tutorials + インストールが成功しました。 + +'[DOTNETHOME]' に以下がインストールされました + • .NET SDK [DOTNETSDKVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + +この製品は使用状況データを収集します + • 詳細およびオプトアウト https://aka.ms/dotnet-cli-telemetry + リソース • .NET ドキュメント https://aka.ms/dotnet-docs • SDK ドキュメント https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index 99a59349c..e8fde1177 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -58,6 +58,21 @@ 이 제품은 사용량 현황 데이터를 수집합니다. • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry +리소스 + • .NET 설명서 https://aka.ms/dotnet-docs + • SDK 설명서 https://aka.ms/dotnet-sdk-docs + • 릴리스 정보 https://aka.ms/dotnet5-release-notes + • 자습서 https://aka.ms/dotnet-tutorials + 설치가 완료되었습니다. + +다음이 '[DOTNETHOME]'에 설치되었습니다. + • .NET SDK [DOTNETSDKVERSION] + • .NET 런타임 [DOTNETRUNTIMEVERSION] + • ASP.NET Core 런타임 [ASPNETCOREVERSION] + +이 제품은 사용량 현황 데이터를 수집합니다. + • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry + 리소스 • .NET 설명서 https://aka.ms/dotnet-docs • SDK 설명서 https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index c22a5a48e..7b7e0aca2 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -58,6 +58,21 @@ Następujące elementy zostały zainstalowane w: „[DOTNETHOME]” Ten produkt gromadzi dane dotyczące użycia • Więcej informacji i rezygnacja: https://aka.ms/dotnet-cli-telemetry +Zasoby + • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs + • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs + • Informacje o wersji: https://aka.ms/dotnet5-release-notes + • Samouczki: https://aka.ms/dotnet-tutorials + Instalacja zakończyła się pomyślnie. + +Następujące elementy zostały zainstalowane w: „[DOTNETHOME]” + • Zestaw .NET SDK [DOTNETSDKVERSION] + • Środowisko uruchomieniowe platformy .NET [DOTNETRUNTIMEVERSION] + • Środowisko uruchomieniowe platformy ASP.NET Core [ASPNETCOREVERSION] + +Ten produkt gromadzi dane dotyczące użycia + • Więcej informacji i rezygnacja: https://aka.ms/dotnet-cli-telemetry + Zasoby • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index c405afb11..257d6ebb7 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -58,6 +58,21 @@ O seguinte foi instalado em: '[DOTNETHOME]' Este produto coleta dados de uso • Para obter mais informações ou recusá-lo, acesse https://aka.ms/dotnet-cli-telemetry +Recursos + • Documentação do .NET: https://aka.ms/dotnet-docs + • Documentação do SDK: https://aka.ms/dotnet-sdk-docs + • Notas sobre a Versão: https://aka.ms/netcore3releasenotes + • Tutoriais: https://aka.ms/dotnet-tutorials + A instalação foi bem-sucedida. + +O seguinte foi instalado em: '[DOTNETHOME]' + • SDK do .NET [DOTNETSDKVERSION] + • Runtime do .NET [DOTNETRUNTIMEVERSION] + • Runtime do ASP.NET Core [ASPNETCOREVERSION] + +Este produto coleta dados de uso + • Para obter mais informações ou recusá-lo, acesse https://aka.ms/dotnet-cli-telemetry + Recursos • Documentação do .NET: https://aka.ms/dotnet-docs • Documentação do SDK: https://aka.ms/dotnet-sdk-docs @@ -71,7 +86,7 @@ Recursos <A HREF="https://aka.ms/dotnet-docs">Documentação do .NET</A> <A HREF="https://aka.ms/dotnet-cli-docs">Documentação do SDK</A> <A HREF="https://aka.ms/dev-privacy">Política de Privacidade</A> - < A HREF = "https://aka.ms/dotnet-License-Windows" > Informações de licenciamento para .NET</A> + <A HREF="https://aka.ms/dotnet-License-Windows">Informações de licenciamento para .NET</A> Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index e79c2aa1f..d9508dcd5 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -58,6 +58,21 @@ Этот продукт собирает данные об использовании. • Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу https://aka.ms/dotnet-cli-telemetry +Ресурсы + • Документация по .NET: https://aka.ms/dotnet-docs + • Документация по SDK: https://aka.ms/dotnet-sdk-docs + • Заметки о выпуске: https://aka.ms/dotnet5-release-notes + • Учебники: https://aka.ms/dotnet-tutorials + Установка выполнена. + +В "[DOTNETHOME]" установлены следующие компоненты: + • Пакет SDK для .NET [DOTNETSDKVERSION] + • Среда выполнения .NET [DOTNETRUNTIMEVERSION] + • Среда выполнения ASP.NET Core [ASPNETCOREVERSION] + +Этот продукт собирает данные об использовании. + • Чтобы получить дополнительные сведения или отказаться от использования продукта, перейдите на страницу https://aka.ms/dotnet-cli-telemetry + Ресурсы • Документация по .NET: https://aka.ms/dotnet-docs • Документация по SDK: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index f80a96737..8b194934c 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -58,6 +58,21 @@ Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]' Bu ürün, kullanım verilerini toplar • Daha fazla bilgi ve katılmamayı seçmek için bkz. https://aka.ms/dotnet-cli-telemetry +Kaynaklar + • .NET Belgeleri https://aka.ms/dotnet-docs + • SDK Belgeleri https://aka.ms/dotnet-sdk-docs + • Sürüm Notları https://aka.ms/dotnet5-release-notes + • Öğreticiler https://aka.ms/dotnet-tutorials + Yükleme başarılı oldu. + +Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]' + • .NET SDK [DOTNETSDKVERSION] + • .NET Çalışma Zamanı [DOTNETRUNTIMEVERSION] + • ASP.NET Core Çalışma Zamanı [ASPNETCOREVERSION] + +Bu ürün, kullanım verilerini toplar + • Daha fazla bilgi ve katılmamayı seçmek için bkz. https://aka.ms/dotnet-cli-telemetry + Kaynaklar • .NET Belgeleri https://aka.ms/dotnet-docs • SDK Belgeleri https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index d3e6e3568..661b39718 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -58,6 +58,21 @@ 此产品会收集用法数据 • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry +资源 + • .NET 文档: https://aka.ms/dotnet-docs + • SDK 文档: https://aka.ms/dotnet-sdk-docs + • 发行说明: https://aka.ms/dotnet5-release-notes + • 教程: https://aka.ms/dotnet-tutorials +已成功安装。 + +下列项安装于: "[DOTNETHOME]" + • .NET SDK [DOTNETSDKVERSION] + • .NET 运行时 [DOTNETRUNTIMEVERSION] + • ASP.NET Core 运行时 [ASPNETCOREVERSION] + +此产品会收集用法数据 + • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry + 资源 • .NET 文档: https://aka.ms/dotnet-docs • SDK 文档: https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index d70eaa727..b15841abd 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -58,6 +58,21 @@ Se instaló lo siguiente en: "[DOTNETHOME]" Este producto recopila datos de uso • Para obtener más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry +Recursos + • Documentación de .NET https://aka.ms/dotnet-docs + • Documentación del SDK https://aka.ms/dotnet-sdk-docs + • Notas de la versión https://aka.ms/dotnet5-release-notes + • Tutoriales https://aka.ms/dotnet-tutorials + La instalación se realizó correctamente. + +Se instaló lo siguiente en: "[DOTNETHOME]" + • SDK de .NET [DOTNETSDKVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + +Este producto recopila datos de uso + • Para obtener más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry + Recursos • Documentación de .NET https://aka.ms/dotnet-docs • Documentación del SDK https://aka.ms/dotnet-sdk-docs diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec new file mode 100644 index 000000000..6b60dae86 --- /dev/null +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec @@ -0,0 +1,18 @@ + + + + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator + 1.0.0 + VS.Redist.Common.Net.Core.SDK.VSTemplateLocator + Microsoft + Microsoft + https://www.microsoft.com/net/dotnet_library_license.htm + https://github.com/dotnet/core-sdk + true + MSBuild extensions bundled with .NET Core SDK for internal Visual Studio build consumption + © Microsoft Corporation. All rights reserved. + + + + + diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 6b41f8564..e22f99c6f 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -14,6 +14,10 @@ WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE) + + WixBundleInstalled OR ((NOT (DOTNETHOME_ARM64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE) + + - - - - - + + + + + + + + + + + @@ -107,15 +142,13 @@ - - - + @@ -128,12 +161,16 @@ - - + + + + + + @@ -142,6 +179,7 @@ + @@ -149,13 +187,23 @@ + + + + + + + + diff --git a/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm b/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm new file mode 100644 index 000000000..3a6f14708 --- /dev/null +++ b/src/redist/targets/packaging/windows/clisdk/bundleArm64.thm @@ -0,0 +1,95 @@ + + + #(loc.Caption) + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + #(loc.Title) + + + + + + #(loc.HelpHeader) + #(loc.HelpText) + + + + + + + + #(loc.WelcomeHeaderMessage) + #(loc.WelcomeDescription) + #(loc.VisualStudioWarning) + #(loc.LicenseAssent) + #(loc.PrivacyStatementLink) + #(loc.DotNetEulaLink) + + + + + + + #(loc.FilesInUseHeader) + #(loc.FilesInUseLabel) + + + + + + + + + + + + + + #(loc.ProgressHeader) + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) + + + + + + + + #(loc.ModifyHeader) + + + + + + + + + #(loc.SuccessHeader) + #(loc.FirstTimeWelcomeMessageArm64) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) + + #(loc.SuccessRestartText) + + + + + + + + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) + #(loc.FailureHyperlinkLogText) + + #(loc.FailureRestartText) + + + + diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs index 0474cb9e0..4c4c9fcc8 100644 --- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs +++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs @@ -2,7 +2,7 @@ - + Installed OR ALLOWMSIINSTALL diff --git a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs index df568a37e..a84391c81 100644 --- a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs +++ b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs @@ -15,6 +15,12 @@ + + VersionNT64 AND DOTNETHOME_ARM64 + + + + VersionNT64 AND DOTNETHOME_X64 diff --git a/src/redist/targets/packaging/windows/clisdk/templates.wxs b/src/redist/targets/packaging/windows/clisdk/templates.wxs index b3e9515ef..a2ef49c4b 100644 --- a/src/redist/targets/packaging/windows/clisdk/templates.wxs +++ b/src/redist/targets/packaging/windows/clisdk/templates.wxs @@ -2,7 +2,7 @@ - + Installed OR ALLOWMSIINSTALL diff --git a/src/redist/targets/packaging/windows/clisdk/variables.wxi b/src/redist/targets/packaging/windows/clisdk/variables.wxi index c9536e77a..bad1ff7ef 100644 --- a/src/redist/targets/packaging/windows/clisdk/variables.wxi +++ b/src/redist/targets/packaging/windows/clisdk/variables.wxi @@ -26,10 +26,23 @@ + + + + + + + + + + + + + diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 97293638a..11c64c7f7 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.IO; -using System.Linq; using System.Runtime.InteropServices; using System.Xml.Linq; using Microsoft.DotNet.TestFramework; @@ -83,51 +82,6 @@ namespace EndToEnd.Tests .Should().Pass().And.HaveStdOutContaining("Hello World!"); } - [WindowsOnlyFact] - public void ItCanPublishArm64Winforms() - { - DirectoryInfo directory = TestAssets.CreateTestDirectory(); - string projectDirectory = directory.FullName; - - string newArgs = "winforms --no-restore"; - new NewCommandShim() - .WithWorkingDirectory(projectDirectory) - .Execute(newArgs) - .Should().Pass(); - - string publishArgs="-r win-arm64"; - new PublishCommand() - .WithWorkingDirectory(projectDirectory) - .Execute(publishArgs) - .Should().Pass(); - - var selfContainedPublishDir = new DirectoryInfo(projectDirectory) - .Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault() - .Sub("win-arm64").Sub("publish"); - - selfContainedPublishDir.Should().HaveFilesMatching("System.Windows.Forms.dll", SearchOption.TopDirectoryOnly); - selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly); - } - - [WindowsOnlyFact] - public void ItCantPublishArm64Wpf() - { - DirectoryInfo directory = TestAssets.CreateTestDirectory(); - string projectDirectory = directory.FullName; - - string newArgs = "wpf --no-restore"; - new NewCommandShim() - .WithWorkingDirectory(projectDirectory) - .Execute(newArgs) - .Should().Pass(); - - string publishArgs="-r win-arm64"; - new PublishCommand() - .WithWorkingDirectory(projectDirectory) - .Execute(publishArgs) - .Should().Fail(); - } - [Theory] [InlineData("console")] [InlineData("classlib")] diff --git a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs index 3d5082f32..29c56731f 100644 --- a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs +++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs @@ -9,7 +9,7 @@ namespace EndToEnd [Fact] public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInStableBuilds() { - var result = CalculateTemplateVersions.Calculate("3.1.0", "dev"); + var result = CalculateTemplateVersions.Calculate("3.1.0"); result.Should() .Be(("3.1.1", "3.1", "3.1.1"), @@ -20,16 +20,16 @@ namespace EndToEnd [Fact] public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInNonStableBuilds() { - var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6", "dev"); + var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6"); result.Should() - .Be(("3.0.1-dev", "3.0", "3.0.1")); + .Be(("3.0.1-alpha.1.20071.6", "3.0", "3.0.1")); } [Fact] public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInStableBuilds() { - var result = CalculateTemplateVersions.Calculate("5.1.0", "dev"); + var result = CalculateTemplateVersions.Calculate("5.1.0"); result.Should() .Be(("5.1.0", "5.1", "5.1.0"), @@ -40,10 +40,10 @@ namespace EndToEnd [Fact] public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInNonStableBuilds() { - var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "dev"); + var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6"); result.Should() - .Be(("5.0.0-dev", "5.0", "5.0.0")); + .Be(("5.0.0-alpha.1.20071.6", "5.0", "5.0.0")); } } }