William Li
GitHub
commit
5688800e91
40 changed files with 686 additions and 209 deletions
|
|
@ -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
|
||||
|
|
|
|||
16
eng/ManualVersions.props
Normal file
16
eng/ManualVersions.props
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<!-- The following properties (unlike those in version.props) are maintained manually. So
|
||||
when there is a merge conflict, the highest version should generally be chosen, rather
|
||||
than keeping what's in the branch, which is the usual strategy with version.props merge
|
||||
conflicts.
|
||||
|
||||
Basically: In this file, choose the highest version when resolving merge conflicts.
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.3-preview</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.4-preview</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.3-preview</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,6 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<PublishingVersion>3</PublishingVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<Product>Sdk</Product>
|
||||
<BlobStoragePartialRelativePath>$(Product)</BlobStoragePartialRelativePath>
|
||||
|
|
@ -99,30 +103,6 @@
|
|||
PropertyName="FullNugetVersion"/>
|
||||
</ReadLinesFromFile>
|
||||
|
||||
<!-- If the sdk version is stabilized, then we should double publish the binaries to suffixed file names.
|
||||
To do this, create new copies of the blobs, replacing the SdkVersion string in the file name with the
|
||||
FullNugetVersion, except if the FullNuGetVersion is already in the file name (which would end up
|
||||
publishing the same exact file name twice). -->
|
||||
<ItemGroup Condition="'$(DotNetFinalVersionKind)'== 'release'">
|
||||
<SdkAssetsToCopyWithSuffix Include="@(SdkAssetsToPublish)" Condition="'$([System.String]::Copy(`%(Filename)`).Contains(`$(Version)`))' == 'true'">
|
||||
<SuffixedPath>$(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)'))</SuffixedPath>
|
||||
</SdkAssetsToCopyWithSuffix>
|
||||
<CheckSumsToCopyWithSuffix Include="@(CheckSumsToPublish)" Condition="'$([System.String]::Copy(`%(Filename)`).Contains(`$(Version)`))' == 'true'">
|
||||
<SuffixedPath>$(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(Version)' ,'$(FullNuGetVersion)'))</SuffixedPath>
|
||||
</CheckSumsToCopyWithSuffix>
|
||||
</ItemGroup>
|
||||
|
||||
<Copy
|
||||
SourceFiles="@(SdkAssetsToCopyWithSuffix -> '%(Identity)')"
|
||||
DestinationFiles="@(SdkAssetsToCopyWithSuffix -> '%(SuffixedPath)')">
|
||||
<Output TaskParameter="CopiedFiles" ItemName="SdkAssetsToPublishWithSuffix" />
|
||||
</Copy>
|
||||
<Copy
|
||||
SourceFiles="@(CheckSumsToCopyWithSuffix -> '%(Identity)')"
|
||||
DestinationFiles="@(CheckSumsToCopyWithSuffix -> '%(SuffixedPath)')">
|
||||
<Output TaskParameter="CopiedFiles" ItemName="CheckSumsToPublishWithSuffix" />
|
||||
</Copy>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- Always publish blobs to a suffixed directory. -->
|
||||
<SdkAssetsToPushToBlobFeed Include="@(SdkAssetsToPublish)">
|
||||
|
|
@ -137,36 +117,28 @@
|
|||
<ChecksumsToPushToBlobFeed Include="@(CheckSumsToPublish)">
|
||||
<RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
|
||||
</ChecksumsToPushToBlobFeed>
|
||||
|
||||
<SdkAssetsWithSuffixToPushToBlobFeed Include="@(SdkAssetsToPublishWithSuffix)">
|
||||
<RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
|
||||
<ManifestArtifactData>NonShipping=true</ManifestArtifactData>
|
||||
</SdkAssetsWithSuffixToPushToBlobFeed>
|
||||
|
||||
<ChecksumsWithSuffixToPushToBlobFeed Include="@(CheckSumsToPublishWithSuffix)" Condition="'$(DotNetFinalVersionKind)'== 'release'">
|
||||
<RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
|
||||
<ManifestArtifactData>NonShipping=true</ManifestArtifactData>
|
||||
</ChecksumsWithSuffixToPushToBlobFeed>
|
||||
</ItemGroup>
|
||||
|
||||
<PushToAzureDevOpsArtifacts
|
||||
ItemsToPush="@(SdkAssetsToPushToBlobFeed);@(SdkAssetsWithSuffixToPushToBlobFeed)"
|
||||
ItemsToPush="@(SdkAssetsToPushToBlobFeed)"
|
||||
ManifestBuildData="@(ManifestBuildData)"
|
||||
ManifestRepoUri="$(BUILD_REPOSITORY_URI)"
|
||||
ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
|
||||
ManifestBranch="$(BUILD_SOURCEBRANCH)"
|
||||
ManifestBuildId="$(BUILD_BUILDNUMBER)"
|
||||
ManifestCommit="$(BUILD_SOURCEVERSION)"
|
||||
AssetManifestPath="$(InstallersAssetManifestFilePath)"
|
||||
PublishFlatContainer="true" />
|
||||
PublishFlatContainer="true"
|
||||
PublishingVersion="3"/>
|
||||
|
||||
<PushToAzureDevOpsArtifacts
|
||||
ItemsToPush="@(ChecksumsToPushToBlobFeed);@(ChecksumsWithSuffixToPushToBlobFeed)"
|
||||
ItemsToPush="@(ChecksumsToPushToBlobFeed)"
|
||||
ManifestBuildData="@(ManifestBuildData)"
|
||||
ManifestRepoUri="$(BUILD_REPOSITORY_URI)"
|
||||
ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
|
||||
ManifestBranch="$(BUILD_SOURCEBRANCH)"
|
||||
ManifestBuildId="$(BUILD_BUILDNUMBER)"
|
||||
ManifestCommit="$(BUILD_SOURCEVERSION)"
|
||||
AssetManifestPath="$(ChecksumsAssetManifestFilePath)"
|
||||
PublishFlatContainer="true" />
|
||||
PublishFlatContainer="true"
|
||||
PublishingVersion="3"/>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-rc.1.20417.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-rc.2.20474.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>85186023c8de8237268033cadc41d738b7f2005e</Sha>
|
||||
<Sha>bc1c3f252a60f9887bd55b67a2c585e8cf83300e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-rc.1.20417.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-rc.2.20474.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>85186023c8de8237268033cadc41d738b7f2005e</Sha>
|
||||
<Sha>bc1c3f252a60f9887bd55b67a2c585e8cf83300e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-rc.1.20417.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-rc.2.20474.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>85186023c8de8237268033cadc41d738b7f2005e</Sha>
|
||||
<Sha>bc1c3f252a60f9887bd55b67a2c585e8cf83300e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20468.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
|
|
@ -43,29 +43,33 @@
|
|||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>a820ca1c4f9cb5892331e2624d3999c39161fe2a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.2.20466.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.2.20474.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>b98b74a59c3a6b0466015bc3d00485ac83540d92</Sha>
|
||||
<Sha>8d8d293b192d38a4cc8d2e13d944936402d20e7f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0-rc.2.20466.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="5.0.0-rc.2.20474.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>b98b74a59c3a6b0466015bc3d00485ac83540d92</Sha>
|
||||
<Sha>8d8d293b192d38a4cc8d2e13d944936402d20e7f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0" Version="5.0.0-rc.2.20466.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0-rc.2.20474.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>b98b74a59c3a6b0466015bc3d00485ac83540d92</Sha>
|
||||
<Sha>8d8d293b192d38a4cc8d2e13d944936402d20e7f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="5.0.0-rc.2.20466.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0" Version="5.0.0-rc.2.20474.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>b98b74a59c3a6b0466015bc3d00485ac83540d92</Sha>
|
||||
<Sha>8d8d293b192d38a4cc8d2e13d944936402d20e7f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="5.0.0-rc.2.20466.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="5.0.0-rc.2.20474.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>b98b74a59c3a6b0466015bc3d00485ac83540d92</Sha>
|
||||
<Sha>8d8d293b192d38a4cc8d2e13d944936402d20e7f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-watch" Version="5.0.0-rc.2.20466.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="5.0.0-rc.2.20474.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>b98b74a59c3a6b0466015bc3d00485ac83540d92</Sha>
|
||||
<Sha>8d8d293b192d38a4cc8d2e13d944936402d20e7f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-watch" Version="5.0.0-rc.2.20474.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>8d8d293b192d38a4cc8d2e13d944936402d20e7f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.20420.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -88,23 +92,73 @@
|
|||
<Sha>dca8aadaf063ac18f8c19e038a973591d526fbf5</Sha>
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-rc.1.20417.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-rc.2.20473.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>b014c89fafff342c92c27968f8231b5032b12954</Sha>
|
||||
<Sha>5e62c5676f7370ae1d682cf44cf285cf781610fb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-rc.1.20417.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-rc.2.20474.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>b91ba697c48bc7825580e3c7fa09c5c3781c3788</Sha>
|
||||
<Sha>b2f9f821159d07d87a6ff0b7f488d1927d2f0fff</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20471.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>03283e07f6bd5717797acb288cf6044cedca2202</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.8.0-release-20200924-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>2418d9ec492e93245e1ce8699d6ae9cd7b86649b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rc.2.20468.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/mono/linker</Uri>
|
||||
<Sha>6d26f7ac409c5723bca669385e65582e69b4da75</Sha>
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-4.20474.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>6791eb21f5219b7e2c5e938044ef841abc1de553</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="16.8.0-preview-20473-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>250161603c003af239d6e276c4fc6357586ba301</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="5.8.0-rc.6853" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
|
||||
<Sha>0e5413751caebf168e7d363c88b9c22a3560fe60</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/cliCommandLineParser</Uri>
|
||||
<Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
<Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
|
||||
<Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
|
||||
</Dependency>
|
||||
<!-- Temporarily pinning Microsoft.Web.Xdt until strict coherency is enabled by default -->
|
||||
<Dependency Name="Microsoft.Web.Xdt" Version="3.1.0" CoherentParentDependency="Microsoft.NET.Sdk" Pinned="true">
|
||||
<Uri>https://github.com/aspnet/xdt</Uri>
|
||||
<Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20472.36">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20471.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>06ad7cf82dbf56b3facf8a7d3a00944f5116663d</Sha>
|
||||
<Sha>0365488709f58e37de6c2180e7fb243203ca0a9c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20472.36">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20471.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>06ad7cf82dbf56b3facf8a7d3a00944f5116663d</Sha>
|
||||
<Sha>0365488709f58e37de6c2180e7fb243203ca0a9c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
<Sha>639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20464-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||
<Sha>8a3edd1902dbfe3adba65f22e3bb7aa2cc73e97f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="XliffTasks" Version="1.0.0-beta.20420.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||
<Sha>975065e08307a459dc2649b1c852f5c4cafd2f91</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@
|
|||
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
|
||||
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
|
||||
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
|
||||
<!-- Enable to remove prerelease label. -->
|
||||
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
|
||||
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
|
|
@ -21,15 +24,15 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-rc.1.20417.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-rc.2.20473.8</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-rc.1.20417.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-rc.2.20474.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.0-alpha.1.20471.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-rc.2.20474.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -41,41 +44,43 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.0-rc.2.20466.8</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>5.0.0-rc.2.20466.8</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>5.0.0-rc.2.20466.8</VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>5.0.0-rc.2.20466.8</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>5.0.0-rc.2.20466.8</dotnetusersecretsPackageVersion>
|
||||
<dotnetwatchPackageVersion>5.0.0-rc.2.20466.8</dotnetwatchPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.0-rc.2.20474.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>5.0.0-rc.2.20474.4</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>5.0.0-rc.2.20474.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>5.0.0-rc.2.20474.4</VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>5.0.0-rc.2.20474.4</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>5.0.0-rc.2.20474.4</dotnetusersecretsPackageVersion>
|
||||
<dotnetwatchPackageVersion>5.0.0-rc.2.20474.4</dotnetwatchPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.100-alpha.1.20471.13</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-alpha.1.20471.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>5.0.100-rc.2.20474.17</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-rc.2.20474.17</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-alpha.1.20468.7</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.2.20474.5</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>6.0.0-alpha.1.20468.7</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20468.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.0-alpha.1.20468.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-alpha.1.20468.7</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-alpha.1.20468.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.2.20474.5</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.2.20474.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-rc.2.20474.5</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.2.20474.5</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-rc.2.20474.5</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-rc.1.20417.4</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-rc.1.20417.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-rc.1.20417.4</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-rc.2.20474.5</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-rc.2.20474.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-rc.2.20474.5</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
@ -105,6 +110,7 @@
|
|||
<MicrosoftDotNetCommonProjectTemplates31PackageVersion>$(MicrosoftDotNetCommonItemTemplates31PackageVersion)</MicrosoftDotNetCommonProjectTemplates31PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates31PackageVersion>$(MicrosoftDotNetTestProjectTemplates50PackageVersion)</MicrosoftDotNetTestProjectTemplates31PackageVersion>
|
||||
<AspNetCorePackageVersionFor31Templates>3.1.7</AspNetCorePackageVersionFor31Templates>
|
||||
<MicrosoftAspNetCoreComponentsWebAssemblyTemplatesPackageVersion>3.2.1</MicrosoftAspNetCoreComponentsWebAssemblyTemplatesPackageVersion>
|
||||
<!-- 3.0 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>4.8.0-rc2.19462.10</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplates30PackageVersion>3.0.0</MicrosoftDotNetWpfProjectTemplates30PackageVersion>
|
||||
|
|
@ -118,21 +124,17 @@
|
|||
<MicrosoftDotNetCommonItemTemplates21PackageVersion>1.0.2-beta3</MicrosoftDotNetCommonItemTemplates21PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates21PackageVersion>$(MicrosoftDotNetCommonItemTemplates21PackageVersion)</MicrosoftDotNetCommonProjectTemplates21PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates21PackageVersion>1.0.2-beta4.20420.1</MicrosoftDotNetTestProjectTemplates21PackageVersion>
|
||||
<AspNetCorePackageVersionFor21Templates>2.1.14</AspNetCorePackageVersionFor21Templates>
|
||||
<AspNetCorePackageVersionFor21Templates>2.1.22</AspNetCorePackageVersionFor21Templates>
|
||||
</PropertyGroup>
|
||||
<!-- infrastructure and test only dependencies -->
|
||||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>15.8.0</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.1-preview</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.2-preview</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.1-preview</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
|
||||
<MicrosoftNETTestSdkVersion>16.8.0-release-20200924-01</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
|
||||
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</CLI_NETStandardLibraryNETFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(RepositoryEngineeringDir)ManualVersions.props" />
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
39
src/VSTemplateLocator/VSTemplateLocator.csproj
Normal file
39
src/VSTemplateLocator/VSTemplateLocator.csproj
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
|
||||
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
|
||||
<GenerateDependencyFile>false</GenerateDependencyFile>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
<GenerateRuntimeCofigurationFiles>false</GenerateRuntimeCofigurationFiles>
|
||||
<AssemblyName>UNUSED</AssemblyName>
|
||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="microsoft.dotnet.templateLocator" Version="$(MicrosoftDotnetTemplateLocatorPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true"/>
|
||||
<PackageReference Include="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
|
||||
<PackageReference Include="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target
|
||||
Name="GenerateLayout"
|
||||
Condition=" '$(OS)' == 'Windows_NT' "
|
||||
BeforeTargets="AfterBuild"
|
||||
>
|
||||
<Message Importance="High" Text="$(MSBuildProjectName) -> $(OutputPath)" />
|
||||
|
||||
<RemoveDir Directories="$(OutputPath)" />
|
||||
<MakeDir Directories="$(OutputPath)" />
|
||||
|
||||
<ItemGroup>
|
||||
<_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)')" />
|
||||
</ItemGroup>
|
||||
|
||||
<Copy SourceFiles="@(_VSTemplateLocatorSrc)" DestinationFiles="@(_VSTemplateLocatorDst)" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -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 (
|
||||
|
|
|
|||
|
|
@ -40,6 +40,11 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
|
||||
public ITaskItem[] ReplacementStrings { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a string that a file must contain for the replacement to be performed.
|
||||
/// </summary>
|
||||
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);
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
|
||||
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
|
||||
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -12,6 +13,7 @@
|
|||
/>
|
||||
|
||||
<ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" />
|
||||
<ProjectReference Include="..\VSTemplateLocator\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,29 +1,25 @@
|
|||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Target Name="CalculateTemplatesVersions" DependsOnTargets="SetupWixProperties">
|
||||
|
||||
<CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor50Templates)"
|
||||
VersionSuffix="$(VersionSuffix)">
|
||||
<CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor50Templates)">
|
||||
<Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates50InstallPath" />
|
||||
<Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates50MajorMinorVersion" />
|
||||
<Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates50MajorMinorPatchVersion" />
|
||||
</CalculateTemplateVersions>
|
||||
|
||||
<CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor31Templates)"
|
||||
VersionSuffix="$(VersionSuffix)">
|
||||
<CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor31Templates)">
|
||||
<Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates31InstallPath" />
|
||||
<Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates31MajorMinorVersion" />
|
||||
<Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates31MajorMinorPatchVersion" />
|
||||
</CalculateTemplateVersions>
|
||||
|
||||
<CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor30Templates)"
|
||||
VersionSuffix="$(VersionSuffix)">
|
||||
<CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor30Templates)">
|
||||
<Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates30InstallPath" />
|
||||
<Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates30MajorMinorVersion" />
|
||||
<Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates30MajorMinorPatchVersion" />
|
||||
</CalculateTemplateVersions>
|
||||
|
||||
<CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor21Templates)"
|
||||
VersionSuffix="$(VersionSuffix)">
|
||||
<CalculateTemplateVersions AspNetCorePackageVersionTemplate="$(AspNetCorePackageVersionFor21Templates)">
|
||||
<Output TaskParameter="BundledTemplateInstallPath" PropertyName="BundledTemplates21InstallPath" />
|
||||
<Output TaskParameter="BundledTemplateMajorMinorVersion" PropertyName="BundledTemplates21MajorMinorVersion" />
|
||||
<Output TaskParameter="BundledTemplateMajorMinorPatchVersion" PropertyName="BundledTemplates21MajorMinorPatchVersion" />
|
||||
|
|
@ -70,6 +66,7 @@
|
|||
<Bundled31Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
|
||||
<Bundled31Templates Include="Microsoft.DotNet.Web.ProjectTemplates.3.1" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
|
||||
<Bundled31Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
|
||||
<Bundled31Templates Include="Microsoft.AspNetCore.Components.WebAssembly.Templates" PackageVersion="$(MicrosoftAspNetCoreComponentsWebAssemblyTemplatesPackageVersion)" />
|
||||
<Bundled31Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates31PackageVersion)" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -183,7 +180,7 @@
|
|||
|
||||
<Target Name="LayoutTemplatesFor50MSI"
|
||||
DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
|
||||
Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
|
||||
Condition="$(ProductMonikerRid.StartsWith('win')) And '$(Architecture)' != 'arm'">
|
||||
<Copy SourceFiles="%(Bundled50Templates.RestoredNupkgPath)"
|
||||
DestinationFolder="$(Templates50LayoutPath)templates/$(BundledTemplates50InstallPath)"/>
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
<RemainingFiles Remove="$(SdkOutputDirectory)**\*.resources.dll" />
|
||||
|
||||
<!-- Don't crossgen reference assemblies redisted with msbuild for RoslynCodeTaskFactory -->
|
||||
<RemainingFiles Remove="$(SdkOutputDirectory)ref\*.dll" />
|
||||
<RemainingFiles Remove="$(SdkOutputDirectory)**\ref\*.dll" />
|
||||
|
||||
<DiasymReaderPath Include="$(SharedFrameworkNameVersionPath)/Microsoft.DiaSymReader.Native.$(DIASymReaderCrossgenFilter).dll" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -108,14 +108,12 @@
|
|||
<Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64" />
|
||||
|
||||
<AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
|
||||
<AspNetCoreRuntimePackRids Include="@(AspNetCore31RuntimePackRids)" />
|
||||
<AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);win-arm64" />
|
||||
<AspNetCoreRuntimePackRids Include="@(AspNetCore50RuntimePackRids)" />
|
||||
|
||||
<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
|
||||
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
|
||||
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop31RuntimePackRids)" />
|
||||
<!-- TODO: remove this once WPF is available on ARM64 and replace usage
|
||||
of this group for WindowsDesktopRuntimePackRids. -->
|
||||
<WindowsDesktopRuntimePackWinformsRids Include="@(WindowsDesktopRuntimePackRids);win-arm64" />
|
||||
</ItemGroup>
|
||||
|
||||
<!--
|
||||
|
|
@ -264,7 +262,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
|
||||
TargetingPackVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
|
||||
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
|
||||
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackWinformsRids, '%3B')"
|
||||
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
|
||||
IsWindowsOnly="true"
|
||||
Profile="WindowsForms"
|
||||
/>
|
||||
|
|
@ -277,7 +275,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
TargetingPackName="Microsoft.AspNetCore.App.Ref"
|
||||
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
|
||||
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
|
||||
RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
|
||||
RuntimePackRuntimeIdentifiers="@(AspNetCore50RuntimePackRids, '%3B')"
|
||||
/>
|
||||
|
||||
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
|
||||
<NETCoreAppTargetingPackBlobVersion>$(CoreSetupBlobVersion)</NETCoreAppTargetingPackBlobVersion>
|
||||
<AspNetCoreTargetingPackBlobVersion>$(AspNetCoreBlobVersion)</AspNetCoreTargetingPackBlobVersion>
|
||||
<AspNetCoreTargetingPackBlobVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</AspNetCoreTargetingPackBlobVersion>
|
||||
<WindowsDesktopTargetingPackBlobVersion>$(WindowsDesktopBlobVersion)</WindowsDesktopTargetingPackBlobVersion>
|
||||
<NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
|
||||
</PropertyGroup>
|
||||
|
|
@ -78,10 +78,11 @@
|
|||
<AspNetCoreSharedFxInstallerRid Condition="'$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm'">x64</AspNetCoreSharedFxInstallerRid>
|
||||
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' != '' AND !$([MSBuild]::IsOSPlatform('OSX')) ">aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-$(VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<!-- Note: we use the "-internal" archives and installers that contain only the aspnetcore shared framework, and shouldn't overlap with Microsoft.NETCore.App. -->
|
||||
<DownloadedAspNetCoreSharedFxWixLibFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib</DownloadedAspNetCoreSharedFxWixLibFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<DownloadedAspNetCoreV2ModuleInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension)</DownloadedAspNetCoreV2ModuleInstallerFileName>
|
||||
<AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
|
||||
<AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
|
||||
|
|
@ -167,29 +168,30 @@
|
|||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedSharedFrameworkInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedSharedFrameworkInstallerFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedSharedHostInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedSharedHostInstallerFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedHostFxrInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedHostFxrInstallerFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedNetCoreAppTargetingPackInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedNetCoreAppTargetingPackInstallerFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<!-- TODO: Should we somehow obtain a .NET Standard ARM64 package? -->
|
||||
<BundledInstallerComponent Include="DownloadedNetStandardTargetingPackInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion)</BaseUrl>
|
||||
|
|
@ -198,7 +200,7 @@
|
|||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedNetCoreAppHostPackInstallerFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
|
||||
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedNetCoreAppHostPackInstallerFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
|
@ -251,19 +253,19 @@
|
|||
</BundledLayoutComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedAspNetTargetingPackInstallerFile"
|
||||
Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedAspNetTargetingPackInstallerFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedAspNetCoreSharedFxInstallerFile"
|
||||
Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
|
||||
Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedAspNetCoreSharedFxInstallerFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="DownloadedAspNetCoreSharedFxWixLibFile"
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And !$(Architecture.StartsWith('arm'))">
|
||||
Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64')">
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(DownloadedAspNetCoreSharedFxWixLibFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
|
@ -275,7 +277,7 @@
|
|||
</BundledInstallerComponent>
|
||||
|
||||
<BundledInstallerComponent Include="AspNetCoreSharedFxBaseRuntimeVersionFile"
|
||||
Condition="!$(Architecture.StartsWith('arm'))">
|
||||
Condition="!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64'">
|
||||
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
|
||||
<DownloadFileName>$(AspNetCoreSharedFxBaseRuntimeVersionFileName)</DownloadFileName>
|
||||
</BundledInstallerComponent>
|
||||
|
|
@ -283,7 +285,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(Architecture)' == 'arm'">false</IncludeWpfAndWinForms>
|
||||
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT'">true</IncludeWpfAndWinForms>
|
||||
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT' AND '$(Architecture)' != 'arm64' ">true</IncludeWpfAndWinForms>
|
||||
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' ">false</IncludeWpfAndWinForms>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -403,15 +405,27 @@
|
|||
<PropertyGroup>
|
||||
<ReplacementPattern>"version": ".*"</ReplacementPattern>
|
||||
<ReplacementString>"version": "$(MicrosoftNETCoreAppRuntimePackageVersion)"</ReplacementString>
|
||||
<AspNetCoreRuntimeReplacementString>"version": "$(MicrosoftAspNetCoreAppRuntimePackageVersion)"</AspNetCoreRuntimeReplacementString>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ToolRuntimeConfigPath Include="$(RedistLayoutPath)sdk/$(Version)/**/*.runtimeconfig.json" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Update runtimeconfig files that target Microsoft.NETCore.App -->
|
||||
<ReplaceFileContents
|
||||
InputFiles="@(ToolRuntimeConfigPath)"
|
||||
DestinationFiles="@(ToolRuntimeConfigPath)"
|
||||
ReplacementPatterns="$(ReplacementPattern)"
|
||||
ReplacementStrings="$(ReplacementString)" />
|
||||
ReplacementStrings="$(ReplacementString)"
|
||||
FileMustContainText="Microsoft.NETCore.App" />
|
||||
|
||||
<!-- Update runtimeconfig files that target Microsoft.AspNetCore.App -->
|
||||
<ReplaceFileContents
|
||||
InputFiles="@(ToolRuntimeConfigPath)"
|
||||
DestinationFiles="@(ToolRuntimeConfigPath)"
|
||||
ReplacementPatterns="$(ReplacementPattern)"
|
||||
ReplacementStrings="$(AspNetCoreRuntimeReplacementString)"
|
||||
FileMustContainText="Microsoft.AspNetCore.App" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateVersionFile"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<Target Name="SetupWixProperties" DependsOnTargets="GetCurrentRuntimeInformation">
|
||||
<!-- AcquireWix Properties -->
|
||||
<PropertyGroup>
|
||||
<WixVersion>3.10.4</WixVersion>
|
||||
<WixVersion>3.14.0.4118</WixVersion>
|
||||
<WixDownloadUrl>https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip</WixDownloadUrl>
|
||||
<WixRoot>$(ArtifactsDir)Tools/WixTools/$(WixVersion)</WixRoot>
|
||||
<WixDestinationPath>$(WixRoot)/WixTools.$(WixVersion).zip</WixDestinationPath>
|
||||
|
|
@ -46,6 +46,10 @@
|
|||
<SdkMSBuildExtensionsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>
|
||||
<SdkMSBuildExtensionsSwrFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr</SdkMSBuildExtensionsSwrFile>
|
||||
|
||||
<VSTemplateLocatorLayoutPath>$(ArtifactsDir)bin/VSTemplateLocator/Debug</VSTemplateLocatorLayoutPath>
|
||||
<VSTemplateLocatorNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec</VSTemplateLocatorNuspecFile>
|
||||
<VSTemplateLocatorNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.$(FullNugetVersion).nupkg</VSTemplateLocatorNupkgFile>
|
||||
|
||||
<!-- Temp directory for light command layouts -->
|
||||
<LightCommandObjDir>$(ArtifactsObjDir)/LightCommandPackages</LightCommandObjDir>
|
||||
<!-- Directory for the zipped up light command package -->
|
||||
|
|
@ -243,7 +247,7 @@
|
|||
|
||||
<Target Name="GenerateTemplatesMsis"
|
||||
DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;SetSdkBrandingInfo;SetupTemplatesMsis"
|
||||
Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"
|
||||
Condition="$(ProductMonikerRid.StartsWith('win')) And '$(Architecture)' != 'arm'"
|
||||
Inputs="@(TemplatesMsiComponent);$(TemplatesGenerateMsiPowershellScript)"
|
||||
Outputs="%(TemplatesMsiComponent.MSIInstallerFile)">
|
||||
|
||||
|
|
@ -291,6 +295,9 @@
|
|||
<UpgradeCode>$(Templates50InstallerUpgradeCode)</UpgradeCode>
|
||||
<DependencyKeyName>NetCore_Templates_5.0</DependencyKeyName>
|
||||
</TemplatesMsiComponent>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="!$(Architecture.StartsWith('arm'))">
|
||||
<TemplatesMsiComponent Include="NetCore31TemplatesMsi">
|
||||
<LayoutPath>$(Templates31LayoutPath.TrimEnd('\'))</LayoutPath>
|
||||
<MSIInstallerFile>$(Templates31MSIInstallerFile)</MSIInstallerFile>
|
||||
|
|
@ -511,6 +518,23 @@
|
|||
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateVSTemplateLocatorNupkg"
|
||||
DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
|
||||
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "
|
||||
Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*;
|
||||
$(VSTemplateLocatorNuspecFile);
|
||||
$(GenerateNupkgPowershellScript)"
|
||||
Outputs="$(VSTemplateLocatorNupkgFile)">
|
||||
|
||||
<Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
|
||||
'$(ArtifactsDir)' ^
|
||||
'$(VSTemplateLocatorLayoutPath.TrimEnd('\'))' ^
|
||||
'$(FullNugetVersion)' ^
|
||||
'$(VSTemplateLocatorNuspecFile)' ^
|
||||
'$(VSTemplateLocatorNupkgFile)'" />
|
||||
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateMsis"
|
||||
DependsOnTargets="GenerateLayout;
|
||||
MsiTargetsSetupInputOutputs;
|
||||
|
|
@ -528,8 +552,9 @@
|
|||
GenerateSdkPlaceholderNupkg;
|
||||
GenerateVSToolsNupkg;
|
||||
GenerateVSToolsResolverNupkg;
|
||||
GenerateSdkMSBuildExtensionsNupkg"
|
||||
Condition=" '$(OS)' == 'Windows_NT' and !$(Architecture.StartsWith('arm')) " />
|
||||
GenerateSdkMSBuildExtensionsNupkg;
|
||||
GenerateVSTemplateLocatorNupkg"
|
||||
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' " />
|
||||
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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 @@
|
|||
|
||||
<ItemGroup>
|
||||
<TemplatesMsiFilesToSign Include="$(Templates50MSIInstallerFile)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="!$(Architecture.StartsWith('arm'))">
|
||||
<TemplatesMsiFilesToSign Include="$(Templates31MSIInstallerFile)" />
|
||||
<TemplatesMsiFilesToSign Include="$(Templates30MSIInstallerFile)" />
|
||||
<TemplatesMsiFilesToSign Include="$(Templates21MSIInstallerFile)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<TemplatesMsiFileSignInfo Include="@(TemplatesMsiFilesToSign->'%(Filename)%(Extension)')">
|
||||
<CertificateName>$(InternalCertificateId)</CertificateName>
|
||||
</TemplatesMsiFileSignInfo>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
<Project>
|
||||
<Target Name="GenerateFullNuGetVersion">
|
||||
<PropertyGroup>
|
||||
<FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</FullNugetVersion>
|
||||
<FullNugetVersion>$(VersionPrefix)-$(PreReleaseVersionLabel)</FullNugetVersion>
|
||||
<FullNugetVersion Condition="'$(PreReleaseVersionIteration)' != ''">$(FullNugetVersion).$(PreReleaseVersionIteration)</FullNugetVersion>
|
||||
<FullNugetVersion Condition=" '$(VersionSuffixDateStamp)' != '' And '$(VersionSuffixBuildOfTheDay)' != '' ">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">安裝成功。
|
||||
|
||||
下列項目已安裝在: '[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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">インストールが成功しました。
|
||||
|
||||
'[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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">설치가 완료되었습니다.
|
||||
|
||||
다음이 '[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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">Установка выполнена.
|
||||
|
||||
В "[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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">已成功安装。
|
||||
|
||||
下列项安装于: "[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
|
||||
|
|
|
|||
|
|
@ -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</String>
|
||||
<String Id="FirstTimeWelcomeMessageArm64">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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||
<metadata>
|
||||
<id>VS.Redist.Common.Net.Core.SDK.VSTemplateLocator</id>
|
||||
<version>1.0.0</version>
|
||||
<title>VS.Redist.Common.Net.Core.SDK.VSTemplateLocator</title>
|
||||
<authors>Microsoft</authors>
|
||||
<owners>Microsoft</owners>
|
||||
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
|
||||
<projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
|
||||
<requireLicenseAcceptance>true</requireLicenseAcceptance>
|
||||
<description>MSBuild extensions bundled with .NET Core SDK for internal Visual Studio build consumption</description>
|
||||
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="$PAYLOAD_FILES$\**\*" />
|
||||
</files>
|
||||
</package>
|
||||
|
|
@ -14,6 +14,10 @@
|
|||
WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
|
||||
</bal:Condition>
|
||||
|
||||
<bal:Condition Message="The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"">
|
||||
WixBundleInstalled OR ((NOT (DOTNETHOME_ARM64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
|
||||
</bal:Condition>
|
||||
|
||||
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.Foundation">
|
||||
<bal:WixStandardBootstrapperApplication
|
||||
LicenseFile="dummyeula.rtf"
|
||||
|
|
@ -52,6 +56,7 @@
|
|||
Variable="DOTNETHOME_X86"
|
||||
Path="[ProgramFilesFolder]dotnet"/>
|
||||
|
||||
<?if $(var.Platform)=x64?>
|
||||
<util:RegistrySearch Id="CheckDotnetInstallLocation_x64"
|
||||
Variable="DotnetInstallLocationExists_x64"
|
||||
Result="exists"
|
||||
|
|
@ -79,6 +84,35 @@
|
|||
Variable="DOTNETHOME_X64"
|
||||
Path="[ProgramFiles64Folder]dotnet"/>
|
||||
|
||||
<?elseif $(var.Platform)=arm64?>
|
||||
<util:RegistrySearch Id="CheckDotnetInstallLocation_arm64"
|
||||
Variable="DotnetInstallLocationExists_arm64"
|
||||
Result="exists"
|
||||
Root="HKLM"
|
||||
Key="SOFTWARE\dotnet\Setup\InstalledVersions\arm64"
|
||||
Value="InstallLocation" />
|
||||
<util:RegistrySearch Id="DotnetInstallLocation_arm64"
|
||||
After="CheckDotnetInstallLocation_arm64"
|
||||
Condition="DotnetInstallLocationExists_arm64"
|
||||
Variable="DOTNETHOME_ARM64"
|
||||
Result="value"
|
||||
Root="HKLM"
|
||||
Key="SOFTWARE\dotnet\Setup\InstalledVersions\arm64"
|
||||
Value="InstallLocation" />
|
||||
|
||||
<util:FileSearch Id="DotnetExeSearch_arm64"
|
||||
After="DotnetInstallLocation_arm64"
|
||||
Variable="DotnetExeExists_arm64"
|
||||
Condition="NOT DotnetInstallLocationExists_arm64"
|
||||
Result="exists"
|
||||
Path="[ProgramFiles64Folder]dotnet\dotnet.exe"/>
|
||||
<util:DirectorySearch Id="DotnetExeLocation_arm64"
|
||||
After="DotnetExeSearch_arm64"
|
||||
Condition="DotnetExeExists_arm64"
|
||||
Variable="DOTNETHOME_ARM64"
|
||||
Path="[ProgramFiles64Folder]dotnet"/>
|
||||
<?endif?>
|
||||
|
||||
<!--
|
||||
When installing the SDK bundle to a custom location using the commandline parameters, it is intended, not mandatory, that
|
||||
both "DOTNETHOME_X86" and "DOTNETHOME_X64" should be used on the commandline and should take this convention:
|
||||
|
|
@ -89,6 +123,7 @@
|
|||
-->
|
||||
<Variable Name="DOTNETHOME_X86" Type="string" Value="[ProgramFilesFolder]dotnet" bal:Overridable="yes" />
|
||||
<Variable Name="DOTNETHOME_X64" Type="string" Value="[ProgramFiles64Folder]dotnet" bal:Overridable="yes" />
|
||||
<Variable Name="DOTNETHOME_ARM64" Type="string" Value="[ProgramFiles64Folder]dotnet" bal:Overridable="yes" />
|
||||
<Variable Name="DOTNETHOME" Type="string" Value="[DOTNETHOME_$(var.PlatformToken)]" bal:Overridable="no" />
|
||||
<Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
|
||||
<Variable Name="DOTNETSDKVERSION" Type="string" Value="$(var.NugetVersion)" bal:Overridable="no" />
|
||||
|
|
@ -107,15 +142,13 @@
|
|||
<MsiPackage SourceFile="$(var.SharedHostMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<MsiPackage SourceFile="$(var.WinFormsAndWpfMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<MsiPackage SourceFile="$(var.NetCoreAppTargetingPackMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<MsiPackage SourceFile="$(var.NetCoreAppHostPackMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<?if $(var.Platform)=x86 or $(var.Platform)=x64?>
|
||||
<MsiPackage SourceFile="$(var.AlternateNetCoreAppHostPackMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
|
|
@ -128,12 +161,16 @@
|
|||
<MsiPackage SourceFile="$(var.NetStandardTargetingPackMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<MsiPackage SourceFile="$(var.AspNetTargetingPackMsiSourcePath)">
|
||||
<MsiPackage SourceFile="$(var.WinFormsAndWpfMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<MsiPackage SourceFile="$(var.WindowsDesktopTargetingPackMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<?endif?>
|
||||
<MsiPackage SourceFile="$(var.AspNetTargetingPackMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>
|
||||
<MsiPackage SourceFile="$(var.TemplatesMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
|
||||
|
|
@ -142,6 +179,7 @@
|
|||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
<MsiProperty Name="DOTNETHOME_X86" Value="[DOTNETHOME_X86]" />
|
||||
<MsiProperty Name="DOTNETHOME_X64" Value="[DOTNETHOME_X64]" />
|
||||
<MsiProperty Name="DOTNETHOME_ARM64" Value="[DOTNETHOME_ARM64]" />
|
||||
<MsiProperty Name="EXEFULLPATH" Value="[WixBundleOriginalSource]" />
|
||||
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
|
||||
</MsiPackage>
|
||||
|
|
@ -149,13 +187,23 @@
|
|||
<PackageGroupRef Id="PG_AspNetCoreSharedFramework_x86"/>
|
||||
<?elseif $(var.Platform)=x64?>
|
||||
<PackageGroupRef Id="PG_AspNetCoreSharedFramework_x64"/>
|
||||
<?elseif $(var.Platform)=arm64?>
|
||||
<PackageGroupRef Id="PG_AspNetCoreSharedFramework_arm64"/>
|
||||
<?endif?>
|
||||
</Chain>
|
||||
</Bundle>
|
||||
|
||||
<Fragment>
|
||||
<PayloadGroup Id="DotnetCoreBAPayloads">
|
||||
<!-- This theme is dupped with a slight change: It uses a modified version of FirstTimeWelcomeMessageArm64
|
||||
for SuccessInstallHeader to account for ARM64's lack of support for WPF/WinForms. Once they converge, remove
|
||||
this and remove FirstTimeWelcomeMessageArm64 from the wxl files. -->
|
||||
<?if $(var.Platform)=arm64?>
|
||||
<Payload Name="thm.xml" Compressed="yes" SourceFile="bundleArm64.thm" />
|
||||
<?else?>
|
||||
<Payload Name="thm.xml" Compressed="yes" SourceFile="bundle.thm" />
|
||||
<?endif?>
|
||||
|
||||
<!-- Default/Neutral localized content is US English -->
|
||||
<Payload Name="thm.wxl" Compressed="yes" SourceFile="LCID\1033\bundle.wxl" />
|
||||
<Payload Name="bg.png" Compressed="yes" SourceFile="..\..\osx\clisdk\resources\dotnetbackground.png" />
|
||||
|
|
|
|||
95
src/redist/targets/packaging/windows/clisdk/bundleArm64.thm
Normal file
95
src/redist/targets/packaging/windows/clisdk/bundleArm64.thm
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
|
||||
<Window Width="660" Height="488" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
|
||||
<Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
|
||||
<Font Id="1" Height="-24" Weight="900" Foreground="FFFFFF" Background="D42B51">Segoe UI</Font>
|
||||
<Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
|
||||
<Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
|
||||
<Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
|
||||
<Font Id="5" Height="-14" Weight="500" Foreground="444444">Segoe UI</Font>
|
||||
|
||||
<Text Name="Title" X="11" Y="11" Width="-11" Height="64" FontId="1" Visible="yes" Center="yes" DisablePrefix="yes">#(loc.Title)</Text>
|
||||
|
||||
<Page Name="Help">
|
||||
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
|
||||
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
|
||||
|
||||
<Text Name="HelpHeader" X="151" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
|
||||
<Text Name="HelpText" X="160" Y="115" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
|
||||
<Button Name="HelpCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
|
||||
</Page>
|
||||
<Page Name="Install">
|
||||
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
|
||||
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
|
||||
|
||||
<Text Name="WelcomeText" X="155" Y="80" Width="-11" Height="-70" FontId="2" HexStyle="0x800000" DisablePrefix="yes" />
|
||||
<Text Name="WelcomeHeaderMessage" X="160" Y="80" Width="300" Height="30" FontId="2">#(loc.WelcomeHeaderMessage)</Text>
|
||||
<Text Name="WelcomeDescription" X="160" Y="125" Width="460" Height="65" FontId="3">#(loc.WelcomeDescription)</Text>
|
||||
<Hypertext Name="VisualStudioWarning" X="160" Y="209" Width="460" Height="30" TabStop="yes" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.VisualStudioWarning)</Hypertext>
|
||||
<Text Name="LicenseAssent" X="160" Y="264" Width="460" Height="30" FontId="3">#(loc.LicenseAssent)</Text>
|
||||
<Hypertext Name="PrivacyStatementLink" X="185" Y="301" Width="400" Height="22" FontId="3" TabStop="yes" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.PrivacyStatementLink)</Hypertext>
|
||||
<Hypertext Name="DotNetEulaLink" X="185" Y="323" Width="400" Height="22" FontId="3" TabStop="yes" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.DotNetEulaLink)</Hypertext>
|
||||
<Button Name="InstallButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
|
||||
<Button Name="WelcomeCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
|
||||
</Page>
|
||||
<Page Name="FilesInUse">
|
||||
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
|
||||
|
||||
<Text Name="FilesInUseHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
|
||||
<Text Name="FilesInUseLabel" X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
|
||||
<Text Name="FilesInUseText" X="11" Y="150" Width="-11" Height="-86" FontId="3" DisablePrefix="yes" HexStyle="0x0000000C"></Text>
|
||||
|
||||
<Button Name="FilesInUseCloseRadioButton" X="300" Y="-65" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
|
||||
<Button Name="FilesInUseDontCloseRadioButton" X="300" Y="-45" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
|
||||
|
||||
<Button Name="FilesInUseOkButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
|
||||
<Button Name="FilesInUseCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.FilesInUseCancelButton)</Button>
|
||||
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
|
||||
</Page>
|
||||
<Page Name="Progress">
|
||||
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
|
||||
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
|
||||
|
||||
<Text Name="ProgressHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
|
||||
<Text Name="ProgressLabel" X="11" Y="121" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
|
||||
<Text Name="OverallProgressPackageText" X="85" Y="121" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
|
||||
<Progressbar Name="OverallCalculatedProgressbar" X="11" Y="143" Width="-11" Height="15" />
|
||||
<Button Name="ProgressCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
|
||||
</Page>
|
||||
<Page Name="Modify">
|
||||
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
|
||||
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
|
||||
|
||||
<Text Name="ModifyHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
|
||||
<Button Name="RepairButton" X="-234" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
|
||||
<Button Name="UninstallButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
|
||||
<Button Name="ModifyCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
|
||||
</Page>
|
||||
<Page Name="Success">
|
||||
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
|
||||
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
|
||||
|
||||
<Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
|
||||
<Richedit Name="SuccessInstallHeader" X="160" Y="81" Width="-12" Height="-71" FontId="5" HideWhenDisabled="yes">#(loc.FirstTimeWelcomeMessageArm64)</Richedit>
|
||||
<Text Name="SuccessRepairHeader" X="160" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
|
||||
<Text Name="SuccessUninstallHeader" X="160" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
|
||||
<Button Name="LaunchButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
|
||||
<Text Name="SuccessRestartText" X="-11" Y="-40" Width="400" Height="23" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
|
||||
<Button Name="SuccessRestartButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
|
||||
<Button Name="SuccessCancelButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
|
||||
</Page>
|
||||
<Page Name="Failure">
|
||||
<Image Name="BackgroundImage" X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
|
||||
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
|
||||
|
||||
<Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
|
||||
<Text Name="FailureInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
|
||||
<Text Name="FailureUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
|
||||
<Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
|
||||
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
|
||||
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
|
||||
<Text Name="FailureRestartText" X="-11" Y="-40" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
|
||||
<Button Name="FailureRestartButton" X="-133" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
|
||||
<Button Name="FailureCloseButton" X="-32" Y="-11" Width="99" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
|
||||
</Page>
|
||||
</Theme>
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<?include "Variables.wxi" ?>
|
||||
<Product Id="*" Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
|
||||
<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200" />
|
||||
<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="$(var.InstallerVersion)" />
|
||||
|
||||
<Condition Message="$(var.ProductName) must be installed as part of a coordinated SDK installation.">
|
||||
Installed OR ALLOWMSIINSTALL
|
||||
|
|
|
|||
|
|
@ -15,6 +15,12 @@
|
|||
<RegistryValue Action="write" Name="WpfWinformsTemplates" Type="integer" Value="1" KeyPath="yes"/>
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
<Component Id="DotnetInstallLocation_arm64" Directory="TARGETDIR" Win64="no">
|
||||
<Condition>VersionNT64 AND DOTNETHOME_ARM64</Condition>
|
||||
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\arm64">
|
||||
<RegistryValue Action="write" Name="InstallLocation" Type="string" Value="[DOTNETHOME_ARM64]" KeyPath="yes"/>
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
<Component Id="DotnetInstallLocation_x64" Directory="TARGETDIR" Win64="no">
|
||||
<Condition>VersionNT64 AND DOTNETHOME_X64</Condition>
|
||||
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64">
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<?include "Variables.wxi" ?>
|
||||
<Product Id="*" Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
|
||||
<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200" />
|
||||
<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="$(var.InstallerVersion)" />
|
||||
|
||||
<Condition Message="$(var.ProductName) must be installed as part of a coordinated SDK installation.">
|
||||
Installed OR ALLOWMSIINSTALL
|
||||
|
|
|
|||
|
|
@ -26,10 +26,23 @@
|
|||
<?define WixQuietExec="WixQuietExec64"?>
|
||||
<?define Program_Files="ProgramFiles64Folder"?>
|
||||
<?define Win64AttributeValue=yes?>
|
||||
<?elseif $(var.Platform)=arm64?>
|
||||
<?define PlatformToken="ARM64"?>
|
||||
<?define WixQuietExec="WixQuietExec64"?>
|
||||
<?define Program_Files="ProgramFiles64Folder"?>
|
||||
<?define Win64AttributeValue=yes?>
|
||||
<?else?>
|
||||
<?error Invalid Platform ($(var.Platform))?>
|
||||
<?endif?>
|
||||
|
||||
<!-- See https://docs.microsoft.com/en-us/windows/win32/msi/using-64-bit-windows-installer-packages. -->
|
||||
<!-- For 64-bit packages on the Arm64 platform, the Windows Installer database schema must be 500 or higher. -->
|
||||
<?if $(var.Platform)=arm64?>
|
||||
<?define InstallerVersion="500"?>
|
||||
<?else?>
|
||||
<?define InstallerVersion="200"?>
|
||||
<?endif?>
|
||||
|
||||
<?define DependencyKey = "$(var.DependencyKeyName)_$(var.SDKBundleVersion)_$(var.Platform)"?>
|
||||
<?define DependencyKeyId = "$(var.DependencyKey)" ?>
|
||||
</Include>
|
||||
|
|
|
|||
|
|
@ -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")]
|
||||
|
|
|
|||
|
|
@ -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"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue