Merge branch 'release/6.0.2xx' into merge/release/6.0.1xx-to-release/6.0.2xx
This commit is contained in:
Matt Mitchell
GitHub
commit
aade06c08b
27 changed files with 227 additions and 551 deletions
|
|
@ -37,7 +37,7 @@ variables:
|
|||
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
- group: DotNetBuilds storage account read tokens
|
||||
- name: _InternalRuntimeDownloadArgs
|
||||
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
|
||||
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
|
||||
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
|
||||
/p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
|
||||
|
||||
|
|
|
|||
14
NuGet.config
14
NuGet.config
|
|
@ -7,20 +7,22 @@
|
|||
<clear />
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<add key="darc-int-dotnet-aspnetcore-f9ae0f5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f9ae0f5d/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<add key="darc-pub-dotnet-emsdk-52e9452-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-52e9452f-3/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-52e9452-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-52e9452f-2/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-52e9452-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-52e9452f-1/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-52e9452" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-52e9452f/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<add key="darc-pub-DotNet-msbuild-Trusted-a02f736" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a02f7365/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-be98e88" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-be98e88c/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-65f76a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-65f76a98/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-167140c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-167140c0/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" />
|
||||
|
|
@ -35,17 +37,19 @@
|
|||
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
|
||||
<!-- Temporary feed for Xamarin workload manifest -->
|
||||
<add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
|
||||
<!-- Remove after RTM. Working around lack of automated creation of isolated feeds for nuget client -->
|
||||
<add key="darc-pub-nuget-nuget.client-078701b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-nuget-nuget.client-078701b/nuget/v3/index.json" />
|
||||
</packageSources>
|
||||
<disabledPackageSources>
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<add key="darc-int-dotnet-aspnetcore-f9ae0f5" value="true" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-be98e88" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-65f76a9" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-167140c" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
|
|
|
|||
|
|
@ -90,27 +90,27 @@
|
|||
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.104" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.202" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950</Sha>
|
||||
<Sha>65f76a98c392556c2c395b78a9e4ab2bd9750bbf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.104-servicing.22164.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.202-servicing.22165.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950</Sha>
|
||||
<Sha>65f76a98c392556c2c395b78a9e4ab2bd9750bbf</Sha>
|
||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.104" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.202" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950</Sha>
|
||||
<Sha>65f76a98c392556c2c395b78a9e4ab2bd9750bbf</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.104-servicing.22172.6">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.202-servicing.22172.7">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>50e695e438ba9f826633d4127d891d53fd972314</Sha>
|
||||
<Sha>48cdb7a16e8277e63c5bb52f97bb02198d1a9759</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.104-servicing.22172.6">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.202-servicing.22172.7">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>50e695e438ba9f826633d4127d891d53fd972314</Sha>
|
||||
<Sha>48cdb7a16e8277e63c5bb52f97bb02198d1a9759</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.4-servicing.22164.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -121,39 +121,39 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>fcb07d637abf53791e2c55c63d9207fc3232fe83</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.1-beta.22057.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>6d626ff0752a77d339f609b4d361787dc9ca93a5</Sha>
|
||||
<Sha>7200973937f45e4e270b27634b0550d2954668d3</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.1-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.2-beta.22057.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>6d626ff0752a77d339f609b4d361787dc9ca93a5</Sha>
|
||||
<Sha>7200973937f45e4e270b27634b0550d2954668d3</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-release-20220113-05" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>68bd10d3aee862a9fbb0bac8b3d474bc323024f3</Sha>
|
||||
<Sha>d3c6439b04452047cb62fc645ce341a034bdb5be</Sha>
|
||||
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22124.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/linker</Uri>
|
||||
<Sha>d0662ed8db919642177ddfd06a1c33895a69015f</Sha>
|
||||
<Sha>e9cfb5413a6a7a7b5bfc3b9a73671be2b18642cf</Sha>
|
||||
<SourceBuild RepoName="linker" ManagedOnly="true" />
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.1-1.22157.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.1.0-5.22128.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>27d9215906a62c0a550ba19cd275a2dc94ad88b3</Sha>
|
||||
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.1.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>c9eb9dd64e9a2e8a433900a1a626d65a2bce4428</Sha>
|
||||
<Sha>a02f73656613e752c73ff442cdd72540f4b09f57</Sha>
|
||||
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.1.0-rc.103" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>078701b97eeef2283c1f4605032b5bcf55a80653</Sha>
|
||||
<Sha>f1906d3d581e0ea0bdd282134208d654f8447880</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
|
|
@ -166,7 +166,11 @@
|
|||
<Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
|
||||
<SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.4" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.4">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.200" Version="6.0.4">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
|
||||
</Dependency>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<PropertyGroup>
|
||||
<VersionMajor>6</VersionMajor>
|
||||
<VersionMinor>0</VersionMinor>
|
||||
<VersionSDKMinor>1</VersionSDKMinor>
|
||||
<VersionFeature>05</VersionFeature>
|
||||
<VersionSDKMinor>2</VersionSDKMinor>
|
||||
<VersionFeature>03</VersionFeature>
|
||||
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
|
||||
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
|
||||
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.104</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.202</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.104-servicing.22172.6</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.104-servicing.22172.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.202-servicing.22172.7</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.202-servicing.22172.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
|
||||
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.104</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.202</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
||||
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
|
||||
<!-- 5.0 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.0.0</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.1.0-release-20220113-05</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- dependencies for source-build tarball -->
|
||||
<PropertyGroup>
|
||||
|
|
@ -172,19 +172,19 @@
|
|||
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
|
||||
necessary, and this property is removed from the file.
|
||||
-->
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>6.0.104</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>6.0.103</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
<PropertyGroup>
|
||||
<MauiWorkloadManifestVersion>6.0.101-preview.9.1805</MauiWorkloadManifestVersion>
|
||||
<XamarinAndroidWorkloadManifestVersion>31.0.101-preview.9.16</XamarinAndroidWorkloadManifestVersion>
|
||||
<XamarinIOSWorkloadManifestVersion>15.0.101-preview.9.31</XamarinIOSWorkloadManifestVersion>
|
||||
<XamarinMacCatalystWorkloadManifestVersion>15.0.101-preview.9.31</XamarinMacCatalystWorkloadManifestVersion>
|
||||
<XamarinMacOSWorkloadManifestVersion>12.0.101-preview.9.31</XamarinMacOSWorkloadManifestVersion>
|
||||
<XamarinTvOSWorkloadManifestVersion>15.0.101-preview.9.31</XamarinTvOSWorkloadManifestVersion>
|
||||
<MauiWorkloadManifestVersion>6.0.200-preview.13.2747</MauiWorkloadManifestVersion>
|
||||
<XamarinAndroidWorkloadManifestVersion>31.0.200-preview.13.41</XamarinAndroidWorkloadManifestVersion>
|
||||
<XamarinIOSWorkloadManifestVersion>15.2.301-preview.13.2</XamarinIOSWorkloadManifestVersion>
|
||||
<XamarinMacCatalystWorkloadManifestVersion>15.2.301-preview.13.2</XamarinMacCatalystWorkloadManifestVersion>
|
||||
<XamarinMacOSWorkloadManifestVersion>12.1.301-preview.13.2</XamarinMacOSWorkloadManifestVersion>
|
||||
<XamarinTvOSWorkloadManifestVersion>15.2.301-preview.13.2</XamarinTvOSWorkloadManifestVersion>
|
||||
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60100Version>
|
||||
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</EmscriptenWorkloadManifestVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenManifest60200Version>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60200Version>
|
||||
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest60200Version)</EmscriptenWorkloadManifestVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
|
||||
|
|
|
|||
|
|
@ -80,9 +80,12 @@ jobs:
|
|||
# This prevents allocation of additional agents if the tarball build legs should be skipped.
|
||||
# Only build the tarball if the PR touches source-build source.
|
||||
- script: |
|
||||
if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*'
|
||||
then
|
||||
echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true"
|
||||
fi
|
||||
# Temporarily disable tarball PR validation until source-build is supported in this channel.
|
||||
echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]false"
|
||||
|
||||
# if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*'
|
||||
# then
|
||||
# echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true"
|
||||
# fi
|
||||
displayName: Tarball Build Check
|
||||
name: Tarball_Build_Check
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
should be added to source-build-reference-packages.
|
||||
-->
|
||||
<ItemGroup>
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.Android.Manifest-6.0.100" Version="[$(XamarinAndroidWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.iOS.Manifest-6.0.100" Version="[$(XamarinIOSWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-6.0.100" Version="[$(XamarinMacCatalystWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.macOS.Manifest-6.0.100" Version="[$(XamarinMacOSWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.Maui.Manifest-6.0.100" Version="[$(MauiWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.tvOS.Manifest-6.0.100" Version="[$(XamarinTvOSWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="[$(EmscriptenWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100" Version="[$(MonoWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.Android.Manifest-6.0.200" Version="[$(XamarinAndroidWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.iOS.Manifest-6.0.200" Version="[$(XamarinIOSWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-6.0.200" Version="[$(XamarinMacCatalystWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.macOS.Manifest-6.0.200" Version="[$(XamarinMacOSWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.Maui.Manifest-6.0.200" Version="[$(MauiWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.tvOS.Manifest-6.0.200" Version="[$(XamarinTvOSWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Manifest-6.0.200" Version="[$(EmscriptenWorkloadManifestVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.200" Version="[$(MonoWorkloadManifestVersion)]" />
|
||||
</ItemGroup>
|
||||
|
||||
<!--
|
||||
|
|
@ -39,4 +39,4 @@
|
|||
File="$(TargetPackagesPath)/TextOnlyPackageDirectories.txt"
|
||||
Overwrite="true" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "6.0.104"
|
||||
"dotnet": "6.0.200"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.Build.CentralPackageVersions": "2.0.1",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Mon, 6 Dec 2021 18:39:25 +0000
|
||||
Subject: [PATCH] WebHost delegate nullability
|
||||
|
||||
Addresses the following errors:
|
||||
|
||||
src/Hosting/Hosting/src/Internal/WebHost.cs(83,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func<IServiceProvider, IHostApplicationLifetime?>' (possibly because of nullability attributes).
|
||||
src/Hosting/Hosting/src/Internal/WebHost.cs(86,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func<IServiceProvider, IApplicationLifetime?>' (possibly because of nullability attributes).
|
||||
src/Hosting/Hosting/src/Internal/WebHost.cs(88,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func<IServiceProvider, IApplicationLifetime?>' (possibly because of nullability attributes).
|
||||
|
||||
Cherry-pick of WebHost only changes made under https://github.com/dotnet/aspnetcore/commit/13a460820e90c8f3e90eb4fdbbb3de671389bf0c#diff-6ef451f2ae3e04d73dde362bdf9de6b101aef95e3a4f5190e5c96967d683aef9
|
||||
---
|
||||
src/Hosting/Hosting/src/Internal/WebHost.cs | 14 ++++++--------
|
||||
1 file changed, 6 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/Hosting/Hosting/src/Internal/WebHost.cs b/src/Hosting/Hosting/src/Internal/WebHost.cs
|
||||
index ca52bd1f40..643d03e8af 100644
|
||||
--- a/src/Hosting/Hosting/src/Internal/WebHost.cs
|
||||
+++ b/src/Hosting/Hosting/src/Internal/WebHost.cs
|
||||
@@ -79,16 +79,14 @@ namespace Microsoft.AspNetCore.Hosting
|
||||
_hostingServiceProvider = hostingServiceProvider;
|
||||
_applicationServiceCollection.AddSingleton<ApplicationLifetime>();
|
||||
// There's no way to to register multiple service types per definition. See https://github.com/aspnet/DependencyInjection/issues/360
|
||||
-#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.
|
||||
- _applicationServiceCollection.AddSingleton(services
|
||||
- => services.GetService<ApplicationLifetime>() as IHostApplicationLifetime);
|
||||
+ _applicationServiceCollection.AddSingleton<IHostApplicationLifetime>(services
|
||||
+ => services.GetService<ApplicationLifetime>()!);
|
||||
#pragma warning disable CS0618 // Type or member is obsolete
|
||||
- _applicationServiceCollection.AddSingleton(services
|
||||
- => services.GetService<ApplicationLifetime>() as AspNetCore.Hosting.IApplicationLifetime);
|
||||
- _applicationServiceCollection.AddSingleton(services
|
||||
- => services.GetService<ApplicationLifetime>() as Extensions.Hosting.IApplicationLifetime);
|
||||
+ _applicationServiceCollection.AddSingleton<AspNetCore.Hosting.IApplicationLifetime>(services
|
||||
+ => services.GetService<ApplicationLifetime>()!);
|
||||
+ _applicationServiceCollection.AddSingleton<Extensions.Hosting.IApplicationLifetime>(services
|
||||
+ => services.GetService<ApplicationLifetime>()!);
|
||||
#pragma warning restore CS0618 // Type or member is obsolete
|
||||
-#pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.
|
||||
_applicationServiceCollection.AddSingleton<HostedServiceExecutor>();
|
||||
}
|
||||
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Fri, 22 Oct 2021 13:26:33 -0500
|
||||
Subject: [PATCH] Fix MicrosoftExtensionsVersion
|
||||
|
||||
Move it to eng/Versions.props to make it overridable, and rename it to match an
|
||||
actual package ID.
|
||||
|
||||
Update paramater nullability in src/Logging/SimpleConsoleLogger.cs to be
|
||||
source-compatible with the 6.0 version of these packages.
|
||||
|
||||
See https://github.com/dotnet/format/issues/1400
|
||||
---
|
||||
Directory.Packages.props | 7 +++----
|
||||
eng/Versions.props | 1 +
|
||||
src/Logging/SimpleConsoleLogger.cs | 2 +-
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Directory.Packages.props b/Directory.Packages.props
|
||||
index 6b628c2..9b579ea 100644
|
||||
--- a/Directory.Packages.props
|
||||
+++ b/Directory.Packages.props
|
||||
@@ -2,7 +2,6 @@
|
||||
<!-- <Import Project="eng\Versions.props" /> -->
|
||||
|
||||
<PropertyGroup>
|
||||
- <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>
|
||||
</PropertyGroup>
|
||||
@@ -25,9 +24,9 @@
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
|
||||
<PackageVersion Include="NuGet.Common" Version="$(NuGetVersion)" />
|
||||
<PackageVersion Include="NuGet.Configuration" Version="$(NuGetVersion)" />
|
||||
<PackageVersion Include="NuGet.Frameworks" Version="$(NuGetVersion)" />
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index b1990aa..f6ddbbd 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -15,6 +15,7 @@
|
||||
<PropertyGroup>
|
||||
<MicrosoftBuildVersion>16.11.0</MicrosoftBuildVersion>
|
||||
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion>
|
||||
+ <MicrosoftExtensionsDependencyInjectionVersion>5.0.0</MicrosoftExtensionsDependencyInjectionVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21526.21</MicrosoftNETCoreCompilersPackageVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/command-line-api -->
|
||||
diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs
|
||||
index c361f84..fd8015c 100644
|
||||
--- a/src/Logging/SimpleConsoleLogger.cs
|
||||
+++ b/src/Logging/SimpleConsoleLogger.cs
|
||||
@@ -37,7 +37,7 @@ namespace Microsoft.CodeAnalysis.Tools.Logging
|
||||
_minimalErrorLevel = minimalErrorLevel;
|
||||
}
|
||||
|
||||
- public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
|
||||
+ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
|
||||
{
|
||||
if (!IsEnabled(logLevel))
|
||||
{
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Tue, 19 Oct 2021 16:11:51 -0500
|
||||
Subject: [PATCH] Disable apphost on downlevel frameworks during source-build
|
||||
|
||||
During source-build, disable apphost build for 'fsi' and 'fsc', and
|
||||
'fsyacc', 'fslex', and 'AssemblyCheck' during the bootstrap build.
|
||||
|
||||
Creating an apphost for a net5.0 project while building with a net6.0
|
||||
SDK downloads the apphost pack as a prebuilt. Stopping the projects from
|
||||
creating the apphost removes the prebuilt for source-build.
|
||||
|
||||
To make disabling the apphost work in the bootstrapping build, add a
|
||||
check to eng/build.sh to skip the bootstrap build if we're currently
|
||||
running the "outer" source-build. That gives source-build the ability to
|
||||
run bootstrapping on its own terms. Now, when eng/SourceBuild.props runs
|
||||
bootstrapping, it can pass the DotNetBuildFromSource property through
|
||||
the environment so it takes effect.
|
||||
|
||||
See: https://github.com/dotnet/fsharp/issues/12282
|
||||
|
||||
PR: https://github.com/dotnet/fsharp/pull/12286
|
||||
---
|
||||
eng/SourceBuild.props | 2 +-
|
||||
eng/build.sh | 51 ++++++++++---------
|
||||
.../AssemblyCheck/AssemblyCheck.fsproj | 1 +
|
||||
src/buildtools/fslex/fslex.fsproj | 1 +
|
||||
src/buildtools/fsyacc/fsyacc.fsproj | 1 +
|
||||
src/fsharp/fsc/fsc.fsproj | 1 +
|
||||
src/fsharp/fsi/fsi.fsproj | 1 +
|
||||
7 files changed, 34 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
|
||||
index 22c929f28..903ee00d3 100644
|
||||
--- a/eng/SourceBuild.props
|
||||
+++ b/eng/SourceBuild.props
|
||||
@@ -41,7 +41,7 @@
|
||||
<Exec
|
||||
Command="./build.sh --bootstrap --skipBuild"
|
||||
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
|
||||
- EnvironmentVariables="@(InnerBuildEnv)" />
|
||||
+ EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
diff --git a/eng/build.sh b/eng/build.sh
|
||||
index 9a2aa0083..6af422237 100755
|
||||
--- a/eng/build.sh
|
||||
+++ b/eng/build.sh
|
||||
@@ -240,29 +240,34 @@ function BuildSolution {
|
||||
node_reuse=false
|
||||
|
||||
# build bootstrap tools
|
||||
- bootstrap_config=Proto
|
||||
- bootstrap_dir=$artifacts_dir/Bootstrap
|
||||
- if [[ "$force_bootstrap" == true ]]; then
|
||||
- rm -fr $bootstrap_dir
|
||||
- fi
|
||||
- if [ ! -f "$bootstrap_dir/fslex.dll" ]; then
|
||||
- BuildMessage="Error building tools"
|
||||
- MSBuild "$repo_root/src/buildtools/buildtools.proj" \
|
||||
- /restore \
|
||||
- /p:Configuration=$bootstrap_config
|
||||
-
|
||||
- mkdir -p "$bootstrap_dir"
|
||||
- cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex
|
||||
- cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc
|
||||
- fi
|
||||
- if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
|
||||
- BuildMessage="Error building bootstrap"
|
||||
- MSBuild "$repo_root/proto.proj" \
|
||||
- /restore \
|
||||
- /p:Configuration=$bootstrap_config \
|
||||
-
|
||||
-
|
||||
- cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc
|
||||
+ # source_build=true means we are currently in the outer/wrapper source-build,
|
||||
+ # and building bootstrap needs to wait. The source-build targets will run this
|
||||
+ # script again without setting source_build=true when it is done setting up
|
||||
+ # the build environment. See 'eng/SourceBuild.props'.
|
||||
+ if [[ "$source_build" != true ]]; then
|
||||
+ bootstrap_config=Proto
|
||||
+ bootstrap_dir=$artifacts_dir/Bootstrap
|
||||
+ if [[ "$force_bootstrap" == true ]]; then
|
||||
+ rm -fr $bootstrap_dir
|
||||
+ fi
|
||||
+ if [ ! -f "$bootstrap_dir/fslex.dll" ]; then
|
||||
+ BuildMessage="Error building tools"
|
||||
+ MSBuild "$repo_root/src/buildtools/buildtools.proj" \
|
||||
+ /restore \
|
||||
+ /p:Configuration=$bootstrap_config
|
||||
+
|
||||
+ mkdir -p "$bootstrap_dir"
|
||||
+ cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex
|
||||
+ cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc
|
||||
+ fi
|
||||
+ if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
|
||||
+ BuildMessage="Error building bootstrap"
|
||||
+ MSBuild "$repo_root/proto.proj" \
|
||||
+ /restore \
|
||||
+ /p:Configuration=$bootstrap_config
|
||||
+
|
||||
+ cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc
|
||||
+ fi
|
||||
fi
|
||||
|
||||
if [[ "$skip_build" != true ]]; then
|
||||
diff --git a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj
|
||||
index 464b6ef78..5c78bbe6d 100644
|
||||
--- a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj
|
||||
+++ b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj
|
||||
@@ -4,6 +4,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
diff --git a/src/buildtools/fslex/fslex.fsproj b/src/buildtools/fslex/fslex.fsproj
|
||||
index 1959ce59c..3d63bf6bf 100644
|
||||
--- a/src/buildtools/fslex/fslex.fsproj
|
||||
+++ b/src/buildtools/fslex/fslex.fsproj
|
||||
@@ -5,6 +5,7 @@
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
diff --git a/src/buildtools/fsyacc/fsyacc.fsproj b/src/buildtools/fsyacc/fsyacc.fsproj
|
||||
index 5d1b7141f..63b63c5de 100644
|
||||
--- a/src/buildtools/fsyacc/fsyacc.fsproj
|
||||
+++ b/src/buildtools/fsyacc/fsyacc.fsproj
|
||||
@@ -5,6 +5,7 @@
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj
|
||||
index 7fa31fc21..04025c297 100644
|
||||
--- a/src/fsharp/fsc/fsc.fsproj
|
||||
+++ b/src/fsharp/fsc/fsc.fsproj
|
||||
@@ -12,6 +12,7 @@
|
||||
<OtherFlags>$(OtherFlags) --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
|
||||
<NGenBinary>true</NGenBinary>
|
||||
<UseAppHost>true</UseAppHost>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
|
||||
diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj
|
||||
index 9fd9b1333..eace6c166 100644
|
||||
--- a/src/fsharp/fsi/fsi.fsproj
|
||||
+++ b/src/fsharp/fsi/fsi.fsproj
|
||||
@@ -13,6 +13,7 @@
|
||||
<Win32Resource>fsi.res</Win32Resource>
|
||||
<NGenBinary>true</NGenBinary>
|
||||
<UseAppHost>true</UseAppHost>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <36081148+lbussell@users.noreply.github.com>
|
||||
Date: Wed, 13 Oct 2021 18:26:09 +0000
|
||||
Subject: [PATCH] fix tlens Mono.Cecil reference
|
||||
|
||||
Pull request for applying the patch: https://github.com/dotnet/linker/pull/2317
|
||||
---
|
||||
src/tlens/tlens.csproj | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tlens/tlens.csproj b/src/tlens/tlens.csproj
|
||||
index 92b3754..e17f9fb 100644
|
||||
--- a/src/tlens/tlens.csproj
|
||||
+++ b/src/tlens/tlens.csproj
|
||||
@@ -10,7 +10,8 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
- <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
|
||||
+ <PackageReference Condition="'$(UseCecilPackage)' == 'true'" Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
|
||||
+ <ProjectReference Condition="'$(UseCecilPackage)' != 'true'" Include="../../external/cecil/Mono.Cecil.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Wed, 20 Oct 2021 14:44:36 +0000
|
||||
Subject: [PATCH] Exclude Microsoft.DotNet.ApiCompat from source-build
|
||||
|
||||
Backport PR: https://github.com/dotnet/linker/pull/2326
|
||||
---
|
||||
eng/Tools.props | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/Tools.props b/eng/Tools.props
|
||||
index 494d208..7c32ad5 100644
|
||||
--- a/eng/Tools.props
|
||||
+++ b/eng/Tools.props
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<!-- This file is an Arcade extension point that specifies additional tools to restore. -->
|
||||
<ItemGroup>
|
||||
- <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatVersion)" />
|
||||
+ <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatVersion)" Condition=" '$(DotnetBuildFromSource)' != 'true' "/>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Wed, 20 Oct 2021 14:38:14 +0000
|
||||
Subject: [PATCH 1/2] Upgrade Microsoft.NETFramework.ReferenceAssemblies from
|
||||
1.0.0 to 1.0.2
|
||||
|
||||
Backport PR: https://github.com/dotnet/linker/pull/2326
|
||||
---
|
||||
src/ILLink.Tasks/ILLink.Tasks.csproj | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj
|
||||
index 0ecf5d1..7501ecb 100644
|
||||
--- a/src/ILLink.Tasks/ILLink.Tasks.csproj
|
||||
+++ b/src/ILLink.Tasks/ILLink.Tasks.csproj
|
||||
@@ -53,6 +53,6 @@
|
||||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" PrivateAssets="All" ExcludeAssets="Runtime" />
|
||||
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" Condition=" '$(TargetFramework)' == 'net472' " PrivateAssets="All" Publish="True" />
|
||||
|
||||
- <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
|
||||
+ <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.2" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Mon, 11 Oct 2021 17:09:14 -0500
|
||||
Subject: [PATCH] Remove prebuilt jnm2.ReferenceAssemblies.net35
|
||||
|
||||
This prebuilt package filled a gap in the official 1.0 version of the .NET
|
||||
Framework reference assembly packages. The gap has been fixed in later versions
|
||||
of the official packages. Removal fixes a prebuilt dependency by letting the
|
||||
repo use the official version of the packges, which are produced by SBRP.
|
||||
https://github.com/dotnet/msbuild/issues/6935
|
||||
---
|
||||
src/StringTools/StringTools.csproj | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/src/StringTools/StringTools.csproj b/src/StringTools/StringTools.csproj
|
||||
index fef9909..93a4634 100644
|
||||
--- a/src/StringTools/StringTools.csproj
|
||||
+++ b/src/StringTools/StringTools.csproj
|
||||
@@ -20,17 +20,12 @@
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net35'">
|
||||
<AssemblyName>Microsoft.NET.StringTools.net35</AssemblyName>
|
||||
- <!-- Disable Fx install checks as we're building against jnm2's 3.5 reference assemblies -->
|
||||
- <BypassFrameworkInstallChecks>true</BypassFrameworkInstallChecks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' != 'net35'">
|
||||
<PackageReference Include="System.Memory" />
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
|
||||
</ItemGroup>
|
||||
- <ItemGroup>
|
||||
- <PackageReference Include="jnm2.ReferenceAssemblies.net35" PrivateAssets="All" />
|
||||
- </ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net35'">
|
||||
<Compile Remove="SpanBasedStringBuilder.cs" />
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Tue, 12 Oct 2021 18:14:59 -0500
|
||||
Subject: [PATCH] Disable BannedApiAnalyzers during source-build
|
||||
|
||||
BannedApiAnalyzers has some intentional old dependencies and it's not feasible
|
||||
to build it during source-build. Remove this usage to remove a prebuilt.
|
||||
https://github.com/dotnet/msbuild/issues/6961
|
||||
---
|
||||
eng/Packages.props | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/Packages.props b/eng/Packages.props
|
||||
index 0f478634f..3cc09a008 100644
|
||||
--- a/eng/Packages.props
|
||||
+++ b/eng/Packages.props
|
||||
@@ -45,11 +45,11 @@
|
||||
|
||||
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/>
|
||||
+ <GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
|
||||
- <GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -7,26 +7,27 @@ Removes prebuilts.
|
|||
|
||||
Background Issue: https://github.com/dotnet/source-build/issues/2542
|
||||
---
|
||||
eng/Packages.props | 3 ---
|
||||
eng/dependabot/Packages.props | 3 ---
|
||||
src/Build/Microsoft.Build.csproj | 4 +++-
|
||||
src/Directory.BeforeCommon.targets | 2 +-
|
||||
src/Framework/Microsoft.Build.Framework.csproj | 2 +-
|
||||
src/Samples/Directory.Build.props | 1 +
|
||||
src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++-
|
||||
src/Utilities/Microsoft.Build.Utilities.csproj | 2 +-
|
||||
6 files changed, 9 insertions(+), 7 deletions(-)
|
||||
7 files changed, 10 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/eng/Packages.props b/eng/Packages.props
|
||||
index 2de607c5d..1668addc9 100644
|
||||
--- a/eng/Packages.props
|
||||
+++ b/eng/Packages.props
|
||||
@@ -46,9 +46,6 @@
|
||||
diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props
|
||||
index a1f21de26..ff74d6e7f 100644
|
||||
--- a/eng/dependabot/Packages.props
|
||||
+++ b/eng/dependabot/Packages.props
|
||||
@@ -22,9 +22,6 @@
|
||||
|
||||
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/>
|
||||
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
|
||||
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3" />
|
||||
- </ItemGroup>
|
||||
-
|
||||
- <ItemGroup>
|
||||
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
|
||||
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
|
||||
</ItemGroup>
|
||||
|
||||
diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
|
||||
|
|
@ -34,7 +35,7 @@ index d08e337c5..3b173aee5 100644
|
|||
--- a/src/Build/Microsoft.Build.csproj
|
||||
+++ b/src/Build/Microsoft.Build.csproj
|
||||
@@ -38,8 +38,10 @@
|
||||
<PackageReference Include="System.Reflection.Metadata" Condition="'$(MonoBuild)' == 'true'" />
|
||||
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(FeatureMSIORedist)' == 'true'" />
|
||||
</ItemGroup>
|
||||
|
||||
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
|
|
@ -58,6 +59,19 @@ index 913c97b12..320bffa56 100644
|
|||
<DefineConstants>$(DefineConstants);FEATURE_MSCOREE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
diff --git a/src/Framework/Microsoft.Build.Framework.csproj b/src/Framework/Microsoft.Build.Framework.csproj
|
||||
index df7556447..c7edff611 100644
|
||||
--- a/src/Framework/Microsoft.Build.Framework.csproj
|
||||
+++ b/src/Framework/Microsoft.Build.Framework.csproj
|
||||
@@ -31,7 +31,7 @@
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
<!-- Promote CompilerServices.Unsafe from the old version we get from System.Memory on net472. -->
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
|
||||
- <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
|
||||
+ <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Condition="'$(DotNetBuildFromSource)' != 'true'" />
|
||||
<Reference Include="System.Xaml" />
|
||||
</ItemGroup>
|
||||
|
||||
diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props
|
||||
index 6b9d6cd9f..317ef14a6 100644
|
||||
--- a/src/Samples/Directory.Build.props
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ index c11557248..0e7dd7861 100644
|
|||
|
||||
<!-- Test and package versions -->
|
||||
@@ -33,7 +34,7 @@
|
||||
<PackageReference Update="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildPackageVersion)" />
|
||||
<PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" />
|
||||
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" />
|
||||
<PackageReference Update="Microsoft.DataAI.NuGetRecommender.Contracts" Version="2.1.0" />
|
||||
- <PackageReference Update="Microsoft.Extensions.CommandLineUtils" Version="1.0.1" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Tue, 23 Nov 2021 16:13:36 +0000
|
||||
Subject: [PATCH] Update System.Threading.Tasks.DataFlow version
|
||||
|
||||
Addresses:
|
||||
NuGet.Build.Tasks.csproj : error NU1605: Detected package downgrade: System.Threading.Tasks.Dataflow from 6.0.0 to 4.9.0. Reference the package directly from the project to select a different version. [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> Microsoft.Build.Tasks.Core 17.1.0-preview-21572-15 -> System.Threading.Tasks.Dataflow (>= 6.0.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> System.Threading.Tasks.Dataflow (>= 4.9.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
|
||||
Backport issue: https://github.com/dotnet/source-build/issues/2311
|
||||
---
|
||||
build/packages.targets | 2 +-
|
||||
1 file changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/build/packages.targets b/build/packages.targets
|
||||
index a0aa4cc..ef5a1cc 100644
|
||||
--- a/build/packages.targets
|
||||
+++ b/build/packages.targets
|
||||
@@ -58,7 +59,7 @@
|
||||
<PackageReference Update="System.Security.Cryptography.Cng" Version="$(CryptographyPackagesVersion)" />
|
||||
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(CryptographyPackagesVersion)" />
|
||||
<PackageReference Update="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
|
||||
- <PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
+ <PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
|
||||
<PackageReference Update="VSSDK.TemplateWizardInterface" Version="12.0.4" />
|
||||
<PackageReference Update="VsWebSite.Interop" Version="$(VSFrameworkVersion)" />
|
||||
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.9.0" />
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From 1a415d2019d74bcf009134326d1c25798589de64 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Rummel <crummel@microsoft.com>
|
||||
Date: Tue, 19 Oct 2021 11:39:32 -0500
|
||||
Subject: [PATCH] Apply arcade-powered source-build patches (#55823)
|
||||
|
||||
Don't include desktop artifacts that don't exist in source-build.
|
||||
Source-build doesn't have these artifacts available, even when we eventually will
|
||||
build desktop TFMs, because Roslyn is one of the first builds in source-build.
|
||||
Instead Roslyn is picking up reference packages that don't have the `lib` directory
|
||||
which is causing a build failure. This disables the attempt to grab these desktop
|
||||
artifacts so source-build just skips them instead.
|
||||
|
||||
Backported to roslyn with https://github.com/dotnet/roslyn/pull/55823
|
||||
---
|
||||
.../DesktopCompilerArtifacts.targets | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
|
||||
index c8b87ab6958..107ff051b51 100644
|
||||
--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
|
||||
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
|
||||
@@ -20,7 +20,7 @@
|
||||
VS training data to the assemblies they produce.
|
||||
-->
|
||||
|
||||
- <Target Name="InitializeDesktopCompilerArtifacts">
|
||||
+ <Target Name="InitializeDesktopCompilerArtifacts" Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<ItemGroup>
|
||||
|
||||
<!-- The Roslyn built binaries must be taken from these locations because this is the location where signing occurs -->
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ index 3970bb4e9ea..e96beb550d2 100644
|
|||
@@ -6,6 +6,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>CSharpInteractive</RootNamespace>
|
||||
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
|
||||
<TargetFrameworks>net6.0;net472</TargetFrameworks>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Label="Project References">
|
||||
|
|
@ -34,7 +34,7 @@ index 5bbdf7f03a7..5f732d71534 100644
|
|||
@@ -6,6 +6,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<StartupObject>Sub Main</StartupObject>
|
||||
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
|
||||
<TargetFrameworks>net6.0;net472</TargetFrameworks>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
<RootNamespace></RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
From 752ab8ab199bd1d99353658cb676a6612508333b Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Wed, 8 Sep 2021 21:31:01 +0000
|
||||
Subject: [PATCH] Drop vstest.console netcoreapp2.1 support
|
||||
|
||||
Workaround for https://github.com/microsoft/vstest/issues/3044
|
||||
---
|
||||
src/vstest.console/vstest.console.csproj | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj
|
||||
index 1343e6d9..7c555591 100644
|
||||
--- a/src/vstest.console/vstest.console.csproj
|
||||
+++ b/src/vstest.console/vstest.console.csproj
|
||||
@@ -8,7 +8,7 @@
|
||||
<PropertyGroup>
|
||||
<AssemblyName>vstest.console</AssemblyName>
|
||||
<TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
|
||||
- <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp2.1;net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<WarningsAsErrors>true</WarningsAsErrors>
|
||||
<OutputType>Exe</OutputType>
|
||||
<IsTestProject>false</IsTestProject>
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Tue, 23 Nov 2021 17:45:25 +0000
|
||||
Subject: [PATCH] Update nuspec project target frameworks for source-build
|
||||
|
||||
This patch removes prebuilts caused from targetting netcoreapp1.0
|
||||
|
||||
Backported with https://github.com/microsoft/vstest/pull/3188
|
||||
---
|
||||
src/package/nuspec/Microsoft.TestPlatform.Build.csproj | 3 ++-
|
||||
src/package/nuspec/Microsoft.TestPlatform.CLI.csproj | 3 ++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
|
||||
index 038fbf8..57cde8e 100644
|
||||
--- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
|
||||
+++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
|
||||
@@ -1,7 +1,8 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
- <TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">netcoreapp1.0</TargetFramework>
|
||||
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFramework>
|
||||
<CheckEolTargetFramework>false</CheckEolTargetFramework>
|
||||
<NuspecFile>TestPlatform.Build.nuspec</NuspecFile>
|
||||
<NuspecProperties>version=$(Version)</NuspecProperties>
|
||||
diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
|
||||
index 29198ba..19386eb 100644
|
||||
--- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
|
||||
+++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
|
||||
@@ -1,7 +1,8 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
- <TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">netcoreapp1.0</TargetFramework>
|
||||
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFramework>
|
||||
<CheckEolTargetFramework>false</CheckEolTargetFramework>
|
||||
<NuspecFile>TestPlatform.CLI.nuspec</NuspecFile>
|
||||
<NuspecProperties>version=$(Version)</NuspecProperties>
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From 071dfef93e5431a415bd9298f2ed8aaf9a22524f Mon Sep 17 00:00:00 2001
|
||||
From: dseefeld <dseefeld@microsoft.com>
|
||||
Date: Mon, 11 Oct 2021 19:35:15 +0000
|
||||
Subject: [PATCH] Don't publish for win runtime identifier in source-build
|
||||
|
||||
See https://github.com/microsoft/vstest/pull/3096
|
||||
---
|
||||
src/testhost.x86/testhost.x86.csproj | 2 +-
|
||||
src/testhost/testhost.csproj | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj
|
||||
index 7eb5cd15..09856522 100644
|
||||
--- a/src/testhost.x86/testhost.x86.csproj
|
||||
+++ b/src/testhost.x86/testhost.x86.csproj
|
||||
@@ -19,7 +19,7 @@
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1' AND '$(TargetFramework)' != 'netcoreapp1.0' AND '$(TargetFramework)' != 'net6.0' ">
|
||||
- <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
|
||||
+ <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' != 'true'">win7-x86</RuntimeIdentifier>
|
||||
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
|
||||
<TargetName Condition="'$(TargetFramework)' != 'net451'">$(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86</TargetName>
|
||||
</PropertyGroup>
|
||||
diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj
|
||||
index a780e4e9..ba0fd259 100644
|
||||
--- a/src/testhost/testhost.csproj
|
||||
+++ b/src/testhost/testhost.csproj
|
||||
@@ -16,7 +16,7 @@
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1' AND '$(TargetFramework)' != 'netcoreapp1.0' AND '$(TargetFramework)' != 'net6.0' ">
|
||||
- <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
|
||||
+ <RuntimeIdentifier Condition="'$(DotNetBuildFromSource)' != 'true'">win7-x64</RuntimeIdentifier>
|
||||
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
|
||||
<TargetName Condition="'$(TargetFramework)' != 'net451'">$(AssemblyName).$(TargetFramework)</TargetName>
|
||||
</PropertyGroup>
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -1,7 +1,13 @@
|
|||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain" FeatureBand="6.0.100" Version="$(MonoWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Workload.Emscripten" FeatureBand="6.0.100" Version="$(EmscriptenWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.Android" FeatureBand="6.0.200" Version="$(XamarinAndroidWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.iOS" FeatureBand="6.0.200" Version="$(XamarinIOSWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.MacCatalyst" FeatureBand="6.0.200" Version="$(XamarinMacCatalystWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.macOS" FeatureBand="6.0.200" Version="$(XamarinMacOSWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.Maui" FeatureBand="6.0.200" Version="$(MauiWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.tvOS" FeatureBand="6.0.200" Version="$(XamarinTvOSWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain" FeatureBand="6.0.200" Version="$(MonoWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Workload.Emscripten" FeatureBand="6.0.200" Version="$(EmscriptenWorkloadManifestVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Calculate NuGet package IDs for bundled manifests -->
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<VersionFeature21>30</VersionFeature21>
|
||||
<VersionFeature31>$([MSBuild]::Add($(VersionFeature), 20))</VersionFeature31>
|
||||
<VersionFeature50>$([MSBuild]::Add($(VersionFeature), 12))</VersionFeature50>
|
||||
<VersionFeature31>$([MSBuild]::Add($(VersionFeature), 22))</VersionFeature31>
|
||||
<VersionFeature50>$([MSBuild]::Add($(VersionFeature), 14))</VersionFeature50>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">
|
||||
|
|
@ -370,6 +370,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
|
||||
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
|
||||
RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
|
||||
RuntimePackExcludedRuntimeIdentifiers="android"
|
||||
/>
|
||||
|
||||
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@
|
|||
'$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
|
||||
<ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
|
||||
|
||||
<PortableProductMonikerRid Condition=" '$(PortableProductMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</PortableProductMonikerRid>
|
||||
|
||||
<ArtifactNameSdk>dotnet-sdk-internal$(PgoTerm)</ArtifactNameSdk>
|
||||
<ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)</ArtifactNameCombinedHostHostFxrFrameworkSdk>
|
||||
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@
|
|||
<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="FilesInUseCloseRadioButton" X="165" Y="-65" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
|
||||
<Button Name="FilesInUseDontCloseRadioButton" X="165" 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>
|
||||
|
|
|
|||
Loading…
Reference in a new issue