mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[release/6.0.1xx] Update dependencies from dotnet/sdk (#12451)

Browse source 
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21518.9 to 6.0.0-rtm.21519.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21519.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21518.8 to 12.0.0-beta.21519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21518.8 to 6.0.1-beta.21519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-1.21473.1 to 6.0.100-1.21519.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-6.21515.3 to 4.0.0-6.21519.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21515.2 to 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk)

 - Revert removed feed

 - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Resolve source-build patches

 - Merge branch 'darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Resolve source-build patch conflicts
This commit is contained in:
dotnet-maestro[bot] 2021-10-20 18:30:45 +00:00 • committed by GitHub
parent 960b7c6d5e
commit dca28b2c52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 49 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NuGet.config
View file

@ -7,7 +7,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-pub-dotnet-windowsdesktop-f22ff8b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-f22ff8b3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-windowsdesktop-0e9ab5b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-0e9ab5b0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />

72
eng/Version.Details.xml
View file

@ -3,19 +3,19 @@
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>07d3454cfcd12d931064177e254bf2f739717468</Sha>
<Sha>0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-rtm.21518.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-rtm.21519.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>07d3454cfcd12d931064177e254bf2f739717468</Sha>
<Sha>0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.0-rtm.21518.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.0-rtm.21519.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>07d3454cfcd12d931064177e254bf2f739717468</Sha>
<Sha>0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>07d3454cfcd12d931064177e254bf2f739717468</Sha>
<Sha>0e9ab5b09281d91e6ac527225cc4cbcfd0cc0217</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rtm.21518.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -52,30 +52,30 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5a23dc38e94484ee69f660ef5ffbc92d7b372bc7</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-rtm.21518.20" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-rtm.21519.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c01686185a4ceb8e0c6597a38a57abe2cd059b33</Sha>
<Sha>4aae17def1228a56eef6b1fb2b8fd0d138ebb751</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-rtm.21518.20" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-rtm.21519.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c01686185a4ceb8e0c6597a38a57abe2cd059b33</Sha>
<Sha>4aae17def1228a56eef6b1fb2b8fd0d138ebb751</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-rtm.21518.20" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-rtm.21519.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c01686185a4ceb8e0c6597a38a57abe2cd059b33</Sha>
<Sha>4aae17def1228a56eef6b1fb2b8fd0d138ebb751</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rtm.21518.20" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rtm.21519.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c01686185a4ceb8e0c6597a38a57abe2cd059b33</Sha>
<Sha>4aae17def1228a56eef6b1fb2b8fd0d138ebb751</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.0-rtm.21518.20" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.0-rtm.21519.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c01686185a4ceb8e0c6597a38a57abe2cd059b33</Sha>
<Sha>4aae17def1228a56eef6b1fb2b8fd0d138ebb751</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.0-rtm.21518.20" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.0-rtm.21519.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c01686185a4ceb8e0c6597a38a57abe2cd059b33</Sha>
<Sha>4aae17def1228a56eef6b1fb2b8fd0d138ebb751</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.21473.2">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -103,31 +103,31 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>e380623de8e689cd7209ffe0881b744413e3e0d6</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-rtm.21519.2">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-rtm.21520.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>18232f27b6b1408d0a7095f79d264a8f356338e5</Sha>
<Sha>4d19f430e05e0c0771b6abf86be9bf137f2cc242</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-rtm.21519.2">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-rtm.21520.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>18232f27b6b1408d0a7095f79d264a8f356338e5</Sha>
<Sha>4d19f430e05e0c0771b6abf86be9bf137f2cc242</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="6.0.0-rtm.21518.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rtm.21519.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>e73e15755db6f219e05030ca650debd5b5df8e4c</Sha>
<Sha>080dcacb82db540cc26e5bf9882c6af9320ba535</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.0-rtm.21518.14" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.0-rtm.21519.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>d37c1f5613110dbcd3d735e2723bb8b610acc5cd</Sha>
<Sha>eee7eff2c7837b56fdb7f313540de74bc1b41a41</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21518.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21519.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>10a05c1adde29cbb7ffebf35b6c9612b789beba3</Sha>
<Sha>727a6abda5bb3276f3e8dd918b721c5d21464aac</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.1-beta.21518.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.1-beta.21519.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>10a05c1adde29cbb7ffebf35b6c9612b789beba3</Sha>
<Sha>727a6abda5bb3276f3e8dd918b721c5d21464aac</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-release-20210923-02" CoherentParentDependency="Microsoft.NET.Sdk">
@ -135,15 +135,15 @@
<Sha>68bd10d3aee862a9fbb0bac8b3d474bc323024f3</Sha>
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21473.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>d51cc207fac85547787bbba83f54f69d8e72e9f5</Sha>
<Sha>d0662ed8db919642177ddfd06a1c33895a69015f</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-6.21515.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-6.21519.19" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>95b7a0198f8c805b367f17e4639020ec21c16705</Sha>
<Sha>3a0930fe6990248c848db2f1e323d7dd2052005b</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21515-03" CoherentParentDependency="Microsoft.NET.Sdk">
@ -170,9 +170,9 @@
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>73c8cd3619efc79364fef5fa81989f9e0dd2147b</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21515.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21519.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/source-build</Uri>
<Sha>03462c6b31f9c97d4fb0b9bcca7355b81c7fde76</Sha>
<Sha>10d0f7e94aa45889155c312f51cfc01bf326b853</Sha>
<SourceBuild RepoName="source-build" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.21310.2">

24
eng/Versions.props
View file

@ -23,11 +23,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.0-rtm.21518.9</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.0-rtm.21519.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.0-rtm.21518.14</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.0-rtm.21519.8</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
@ -44,20 +44,20 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.0-rtm.21518.20</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.0-rtm.21518.20</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.0-rtm.21518.20</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rtm.21518.20</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.0-rtm.21518.20</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.0-rtm.21518.20</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.0-rtm.21519.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.0-rtm.21519.6</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.0-rtm.21519.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rtm.21519.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.0-rtm.21519.6</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.0-rtm.21519.6</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-rtm.21519.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-rtm.21519.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-rtm.21520.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-rtm.21520.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -78,8 +78,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-rtm.21518.16</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.0-rtm.21518.16</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-rtm.21519.11</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.0-rtm.21519.11</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.0</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>

34
src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch
View file

@ -1,34 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Thu, 14 Oct 2021 01:15:37 +0000
Subject: [PATCH] Exclude unit and performance test from source-build
---
perf/dotnet-format.Performance.csproj | 1 +
tests/dotnet-format.UnitTests.csproj | 1 +
2 files changed, 2 insertions(+)
diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj
index dd4c95e..c96e8b8 100644
--- a/perf/dotnet-format.Performance.csproj
+++ b/perf/dotnet-format.Performance.csproj
@@ -14,6 +14,7 @@
<!-- Always run on the latest runtime installed. -->
<RollForward>LatestMajor</RollForward>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" />
diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj
index 06dbbb4..f566d6a 100644
--- a/tests/dotnet-format.UnitTests.csproj
+++ b/tests/dotnet-format.UnitTests.csproj
@@ -12,6 +12,7 @@
<!-- Always run on the latest runtime installed. -->
<RuntimeFrameworkVersion>6.0.0-preview.7.21317.1</RuntimeFrameworkVersion>
<RollForward>LatestMajor</RollForward>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>
<ItemGroup>

44
src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch
View file

@ -1,44 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 14 Oct 2021 10:35:52 +0000
Subject: [PATCH] Package version changes to support source-build
---
Directory.Packages.props | 3 +--
eng/Versions.props | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 57c2735..6b628c2 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,7 +2,6 @@
<!-- <Import Project="eng\Versions.props" /> -->
<PropertyGroup>
- <MicrosoftBuildVersion>16.11.0</MicrosoftBuildVersion>
<MicrosoftExtensionsVersion>5.0.0</MicrosoftExtensionsVersion>
<!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
<NuGetVersion>6.0.0-preview.4.221</NuGetVersion>
@@ -15,7 +14,7 @@
<PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.1-beta1.21413.1" />
- <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" />
+ <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
diff --git a/eng/Versions.props b/eng/Versions.props
index 7a39a9c..5270ea4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,6 +13,8 @@
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
</PropertyGroup>
<PropertyGroup>
+ <MicrosoftBuildVersion>16.11.0</MicrosoftBuildVersion>
+ <MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21515.3</MicrosoftNETCoreCompilersPackageVersion>
<!-- Dependencies from https://github.com/dotnet/command-line-api -->

30
src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch
View file

@ -1,30 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "msimons@microsoft.com" <MichaelSimons>
Date: Tue, 19 Oct 2021 14:32:25 +0000
Subject: [PATCH] Project changes to eliminate prebuilts
---
src/dotnet-format.csproj | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
index dbc94b8..994e539 100644
--- a/src/dotnet-format.csproj
+++ b/src/dotnet-format.csproj
@@ -19,7 +19,6 @@
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<!-- Always run on the latest runtime installed. -->
- <RuntimeFrameworkVersion>6.0.0-preview.7.21317.1</RuntimeFrameworkVersion>
<RollForward>LatestMajor</RollForward>
<IsPackable>true</IsPackable>
@@ -29,7 +28,7 @@
These identifiers are for generating the shim'd core executables for signing. Not all options
from $(RoslynPortableRuntimeIdentifiers) work or make sense in this context.
-->
- <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
+ <PackAsToolShimRuntimeIdentifiers Condition=" '$(DotnetBuildFromSource)' != 'true' ">win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>

23
src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch
View file

@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "msimons@microsoft.com" <MichaelSimons>
Date: Tue, 19 Oct 2021 18:59:23 +0000
Subject: [PATCH] Fix humanizer assembly version
Patch for https://github.com/dotnet/source-build/pull/2539
---
.../humanizer/0001-Fix-building-in-a-source-build-context.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch
index 8d31028..7a5e5f3 100644
--- a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch
+++ b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch
@@ -24,7 +24,7 @@ index 842a373..e018285 100644
<TargetFramework>netstandard1.0</TargetFramework>
<Authors>Mehdi Khalili, Oren Novotny</Authors>
<PackageLicenseUrl>https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE</PackageLicenseUrl>
-+ <PackageVersion>2.2.0</PackageVersion>
++ <Version>2.2.0</Version>
<PackageProjectUrl>https://github.com/Humanizr/Humanizer</PackageProjectUrl>
<MinClientVersion>2.12</MinClientVersion>
<Description>A micro-framework that turns your normal strings, type names, enum fields, date fields ETC into a human friendly format</Description>