Merge branch 'release/5.0.1xx-rc2' into juhoyosa/arm64-bundled-installer
This commit is contained in:
Juan Hoyos
GitHub
commit
56b8088573
11 changed files with 226 additions and 127 deletions
|
|
@ -1,37 +1,37 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-rc.2.20460.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-rc.2.20466.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>3b432fcf3ca1020b07b8ccbdd7cbcef569e53323</Sha>
|
||||
<Sha>b9b1d13ac06f5b0a90438da116d0370fb7f679ef</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-rc.2.20460.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-rc.2.20466.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>3b432fcf3ca1020b07b8ccbdd7cbcef569e53323</Sha>
|
||||
<Sha>b9b1d13ac06f5b0a90438da116d0370fb7f679ef</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-rc.2.20460.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-rc.2.20466.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>3b432fcf3ca1020b07b8ccbdd7cbcef569e53323</Sha>
|
||||
<Sha>b9b1d13ac06f5b0a90438da116d0370fb7f679ef</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.2.20460.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.2.20465.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>e3a1128fc78c2836c899bc5099d7e0261888f08f</Sha>
|
||||
<Sha>e24e67a8dd52a20e5aa07b934ce7790c96808b1b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-rc.2.20460.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-rc.2.20465.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>e3a1128fc78c2836c899bc5099d7e0261888f08f</Sha>
|
||||
<Sha>e24e67a8dd52a20e5aa07b934ce7790c96808b1b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.2.20460.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.2.20465.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>e3a1128fc78c2836c899bc5099d7e0261888f08f</Sha>
|
||||
<Sha>e24e67a8dd52a20e5aa07b934ce7790c96808b1b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-rc.2.20460.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-rc.2.20465.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>e3a1128fc78c2836c899bc5099d7e0261888f08f</Sha>
|
||||
<Sha>e24e67a8dd52a20e5aa07b934ce7790c96808b1b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-rc.2.20460.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-rc.2.20465.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>e3a1128fc78c2836c899bc5099d7e0261888f08f</Sha>
|
||||
<Sha>e24e67a8dd52a20e5aa07b934ce7790c96808b1b</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -39,33 +39,37 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-rc.2.20460.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-rc.2.20465.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>e3a1128fc78c2836c899bc5099d7e0261888f08f</Sha>
|
||||
<Sha>e24e67a8dd52a20e5aa07b934ce7790c96808b1b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.2.20460.25" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.2.20466.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e</Sha>
|
||||
<Sha>70bc346d25f1e089d1df4dcdcf2368acf3bb4471</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0-rc.2.20460.25" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="5.0.0-rc.2.20466.1">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e</Sha>
|
||||
<Sha>70bc346d25f1e089d1df4dcdcf2368acf3bb4471</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0" Version="5.0.0-rc.2.20460.25" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0-rc.2.20466.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e</Sha>
|
||||
<Sha>70bc346d25f1e089d1df4dcdcf2368acf3bb4471</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="5.0.0-rc.2.20460.25" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0" Version="5.0.0-rc.2.20466.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e</Sha>
|
||||
<Sha>70bc346d25f1e089d1df4dcdcf2368acf3bb4471</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="5.0.0-rc.2.20460.25" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="5.0.0-rc.2.20466.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e</Sha>
|
||||
<Sha>70bc346d25f1e089d1df4dcdcf2368acf3bb4471</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-watch" Version="5.0.0-rc.2.20460.25" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="5.0.0-rc.2.20466.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>7a74a1bb682b4a94e1dc6b2d6a654c6d6140517e</Sha>
|
||||
<Sha>70bc346d25f1e089d1df4dcdcf2368acf3bb4471</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-watch" Version="5.0.0-rc.2.20466.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>70bc346d25f1e089d1df4dcdcf2368acf3bb4471</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>
|
||||
|
|
@ -75,30 +79,30 @@
|
|||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>a2b05d8171915c69ad97ab5d49bbb07d2c780a67</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-rc.2.20459.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-rc.2.20464.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>e80baefbce805072fc9c51c1b9922e74485fdf21</Sha>
|
||||
<Sha>5c755c0ba2cb1819c105149a76e323e5865c3630</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-rc.2.20461.6">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-rc.2.20466.5">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>f1e1ea9198e0213126fd5727be1f1935ed94df5a</Sha>
|
||||
<Sha>9447809d269fda57fd5c691a0688d61ed336a590</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-rc.2.20461.6">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-rc.2.20466.5">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>f1e1ea9198e0213126fd5727be1f1935ed94df5a</Sha>
|
||||
<Sha>9447809d269fda57fd5c691a0688d61ed336a590</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.2.20460.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-rc.2.20465.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>98f67367df7321b09e9cb5168254a35b83016d2f</Sha>
|
||||
<Sha>4386255554cea35371c97243e260539139c2db1e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-rc.2.20460.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-rc.2.20465.13" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>a07ad521fabf36a783df37341fcadfcdcf8509fb</Sha>
|
||||
<Sha>24665705a1b16f421b545f2a4396b3c2952dbe6f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20460.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20465.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>183ab3a82559908b1b1d477fb3ced179617f4e8d</Sha>
|
||||
<Sha>0edb614e4face390d84f5120017c24e0f7793b4c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.8.0-release-20200902-05" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
|
|
@ -113,9 +117,9 @@
|
|||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>d57cda76c2b76cff75487a085d289cfadd99150b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="16.8.0-preview-20460-02" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="16.8.0-preview-20464-02" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>579c58bd798f402805bafe7bb73a0f7816504caa</Sha>
|
||||
<Sha>0220c5eaeac8dd1770a597a7ba4306651c421bf4</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="5.8.0-preview.3.6823" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
|
||||
|
|
@ -136,21 +140,21 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20459.8">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20465.7">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
|
||||
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20459.8">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20465.7">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
|
||||
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</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-20457-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<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>e9d917c21e38e274a413a207d9e84eb80382b56f</Sha>
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20459.8</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20465.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-rc.2.20460.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-rc.2.20465.8</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-rc.2.20460.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-rc.2.20465.13</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-rc.2.20459.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-rc.2.20464.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -41,41 +41,43 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.0-rc.2.20460.25</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>5.0.0-rc.2.20460.25</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>5.0.0-rc.2.20460.25</VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>5.0.0-rc.2.20460.25</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>5.0.0-rc.2.20460.25</dotnetusersecretsPackageVersion>
|
||||
<dotnetwatchPackageVersion>5.0.0-rc.2.20460.25</dotnetwatchPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.0-rc.2.20466.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>5.0.0-rc.2.20466.1</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>5.0.0-rc.2.20466.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>5.0.0-rc.2.20466.1</VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>5.0.0-rc.2.20466.1</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>5.0.0-rc.2.20466.1</dotnetusersecretsPackageVersion>
|
||||
<dotnetwatchPackageVersion>5.0.0-rc.2.20466.1</dotnetwatchPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>5.0.100-rc.2.20461.6</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-rc.2.20461.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>5.0.100-rc.2.20466.5</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-rc.2.20466.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.2.20460.15</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.2.20465.7</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.2.20460.15</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.2.20460.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-rc.2.20460.15</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.2.20460.15</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-rc.2.20460.15</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.2.20465.7</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.2.20465.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-rc.2.20465.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.2.20465.7</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-rc.2.20465.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-rc.2.20460.13</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-rc.2.20460.13</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-rc.2.20460.13</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-rc.2.20466.1</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-rc.2.20466.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-rc.2.20466.1</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
|
|||
|
|
@ -144,11 +144,27 @@ $ValidatePackage = {
|
|||
|
||||
if ($FailedFiles -eq 0) {
|
||||
Write-Host 'Passed.'
|
||||
return 0
|
||||
return [pscustomobject]@{
|
||||
result = 0
|
||||
packagePath = $PackagePath
|
||||
}
|
||||
}
|
||||
else {
|
||||
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links."
|
||||
return 1
|
||||
return [pscustomobject]@{
|
||||
result = 1
|
||||
packagePath = $PackagePath
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function CheckJobResult(
|
||||
$result,
|
||||
$packagePath,
|
||||
[ref]$ValidationFailures) {
|
||||
if ($jobResult.result -ne '0') {
|
||||
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
|
||||
$ValidationFailures.Value++
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -211,10 +227,8 @@ function ValidateSourceLinkLinks {
|
|||
}
|
||||
|
||||
foreach ($Job in @(Get-Job -State 'Completed')) {
|
||||
$jobResult = Receive-Job -Id $Job.Id
|
||||
if ($jobResult -ne '0') {
|
||||
$ValidationFailures++
|
||||
}
|
||||
$jobResult = Wait-Job -Id $Job.Id | Receive-Job
|
||||
CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
|
||||
Remove-Job -Id $Job.Id
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -141,11 +141,6 @@ $CountMissingSymbols = {
|
|||
if ($using:Clean) {
|
||||
Remove-Item $ExtractPath -Recurse -Force
|
||||
}
|
||||
|
||||
if ($MissingSymbols -ne 0)
|
||||
{
|
||||
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $PackagePath"
|
||||
}
|
||||
|
||||
Pop-Location
|
||||
|
||||
|
|
@ -165,6 +160,7 @@ function CheckJobResult(
|
|||
$DupedSymbols.Value++
|
||||
}
|
||||
elseif ($jobResult.result -ne '0') {
|
||||
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath"
|
||||
$TotalFailures.Value++
|
||||
}
|
||||
}
|
||||
|
|
@ -201,7 +197,6 @@ function CheckSymbolsAvailable {
|
|||
Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null
|
||||
|
||||
$NumJobs = @(Get-Job -State 'Running').Count
|
||||
Write-Host $NumJobs
|
||||
|
||||
while ($NumJobs -ge $MaxParallelJobs) {
|
||||
Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again."
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@
|
|||
}
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20459.8"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20465.7"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
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,18 +12,18 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
{
|
||||
/// <summary>
|
||||
/// Reads contents of an input file, and searches for each replacement passed in.
|
||||
///
|
||||
///
|
||||
/// When ReplacementItems is matched, it will replace the Include/ItemSpec with the corresponding
|
||||
/// ReplacementString metadata value. This can be useful if the ReplacementString is a value that
|
||||
/// cannot be represented by ITaskItem.ItemSpec (like string.Empty).
|
||||
///
|
||||
/// When a ReplacementPattern is matched it will replace it with the string of the corresponding (by index)
|
||||
///
|
||||
/// When a ReplacementPattern is matched it will replace it with the string of the corresponding (by index)
|
||||
/// item in ReplacementStrings.
|
||||
///
|
||||
/// For example, if 2 ReplacementPatterns are passed in, 2 ReplacementStrings must also passed in and the first
|
||||
///
|
||||
/// For example, if 2 ReplacementPatterns are passed in, 2 ReplacementStrings must also passed in and the first
|
||||
/// pattern will be replaced with the first string, and the second pattern replaced with the second string.
|
||||
///
|
||||
/// ReplacementPattern could easily be a regex, but it isn't needed for current use cases, so leaving this
|
||||
///
|
||||
/// ReplacementPattern could easily be a regex, but it isn't needed for current use cases, so leaving this
|
||||
/// as just a string that will be replaced.
|
||||
/// </summary>
|
||||
public class ReplaceFileContents : Task
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
/>
|
||||
|
||||
<ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" />
|
||||
<ProjectReference Include="..\VSTemplateLocator\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -404,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"
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
@ -197,19 +201,14 @@
|
|||
</ItemGroup>
|
||||
<CreateLightCommandPackageDrop
|
||||
LightCommandWorkingDir="$(LightCommandObjDir)"
|
||||
OutputFolder="$(LightCommandPackagesDir)"
|
||||
NoLogo="true"
|
||||
Cultures="en-us"
|
||||
Out="$(SdkMSIInstallerFile)"
|
||||
InstallerFile="$(SdkMSIInstallerFile)"
|
||||
WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
|
||||
WixSrcFiles="@(SdkMsiWixSrcFiles)">
|
||||
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
|
||||
<Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
|
||||
</CreateLightCommandPackageDrop>
|
||||
<MakeDir Directories="$(LightCommandPackagesDir)" />
|
||||
|
||||
<ZipDirectory
|
||||
DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
|
||||
SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
|
||||
Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateSdkPlaceholderMsi"
|
||||
|
|
@ -235,20 +234,15 @@
|
|||
</ItemGroup>
|
||||
<CreateLightCommandPackageDrop
|
||||
LightCommandWorkingDir="$(LightCommandObjDir)"
|
||||
OutputFolder="$(LightCommandPackagesDir)"
|
||||
NoLogo="true"
|
||||
Cultures="en-us"
|
||||
Out="$(SdkPlaceholderMSIInstallerFile)"
|
||||
InstallerFile="$(SdkPlaceholderMSIInstallerFile)"
|
||||
WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
|
||||
WixSrcFiles="@(SdkPlaceholdMsiWixSrcFiles)"
|
||||
AdditionalBasePaths="$(MSBuildThisFileDirectory)packaging/windows/clisdk">
|
||||
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
|
||||
<Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
|
||||
</CreateLightCommandPackageDrop>
|
||||
<MakeDir Directories="$(LightCommandPackagesDir)" />
|
||||
|
||||
<ZipDirectory
|
||||
DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
|
||||
SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
|
||||
Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateTemplatesMsis"
|
||||
|
|
@ -277,19 +271,14 @@
|
|||
|
||||
<CreateLightCommandPackageDrop
|
||||
LightCommandWorkingDir="$(LightCommandObjDir)"
|
||||
OutputFolder="$(LightCommandPackagesDir)"
|
||||
NoLogo="true"
|
||||
Cultures="en-us"
|
||||
Out="%(TemplatesMsiComponent.MSIInstallerFile)"
|
||||
InstallerFile="%(TemplatesMsiComponent.MSIInstallerFile)"
|
||||
WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
|
||||
WixSrcFiles="@(TemplatesMsiWixSrcFiles)">
|
||||
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
|
||||
<Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
|
||||
</CreateLightCommandPackageDrop>
|
||||
<MakeDir Directories="$(LightCommandPackagesDir)" />
|
||||
|
||||
<ZipDirectory
|
||||
DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
|
||||
SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
|
||||
Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="SetupTemplatesMsis">
|
||||
|
|
@ -382,20 +371,15 @@
|
|||
</ItemGroup>
|
||||
<CreateLightCommandPackageDrop
|
||||
LightCommandWorkingDir="$(LightCommandObjDir)"
|
||||
OutputFolder="$(LightCommandPackagesDir)"
|
||||
NoLogo="true"
|
||||
Cultures="en-us"
|
||||
Out="$(CombinedFrameworkSdkHostMSIInstallerFile)"
|
||||
InstallerFile="$(CombinedFrameworkSdkHostMSIInstallerFile)"
|
||||
WixExtensions="WixBalExtension;WixUtilExtension;WixTagExtension"
|
||||
WixSrcFiles="@(BundleMsiWixSrcFiles)"
|
||||
AdditionalBasePaths="$(MSBuildThisFileDirectory)packaging/windows/clisdk">
|
||||
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
|
||||
<Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
|
||||
</CreateLightCommandPackageDrop>
|
||||
<MakeDir Directories="$(LightCommandPackagesDir)" />
|
||||
|
||||
<ZipDirectory
|
||||
DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
|
||||
SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
|
||||
Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateToolsetNupkg"
|
||||
|
|
@ -534,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;
|
||||
|
|
@ -551,7 +552,8 @@
|
|||
GenerateSdkPlaceholderNupkg;
|
||||
GenerateVSToolsNupkg;
|
||||
GenerateVSToolsResolverNupkg;
|
||||
GenerateSdkMSBuildExtensionsNupkg"
|
||||
GenerateSdkMSBuildExtensionsNupkg;
|
||||
GenerateVSTemplateLocatorNupkg"
|
||||
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' " />
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
Loading…
Add table
Reference in a new issue