Merge pull request #12613 from dotnet/darc-release/6.0.2xx-1b244fc7-ac70-4eca-9fcf-17a28ef743e0
[release/6.0.2xx] Update dependencies from dotnet/sdk
This commit is contained in:
dotnet-maestro[bot]
GitHub
parent
196bbe3036
commit
4078d7d023
11 changed files with 22 additions and 322 deletions
|
|
@ -31,8 +31,6 @@
|
|||
<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 />
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -103,14 +103,14 @@
|
|||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>7d941613047c847c87dc8d243a54fd1a45a47de7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-rtm.21527.8">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.21565.34">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>2c798cbf6bf259ce49d94d91bc665a95d42d7a7f</Sha>
|
||||
<Sha>af3b7d0f15282afee493e61c10b0bb170317de8d</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-rtm.21527.8">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.21565.34">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>2c798cbf6bf259ce49d94d91bc665a95d42d7a7f</Sha>
|
||||
<Sha>af3b7d0f15282afee493e61c10b0bb170317de8d</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.21523.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -121,18 +121,18 @@
|
|||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>3f75a67c752a116de292affae29a22bbb5b71b18</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.21565.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>6d626ff0752a77d339f609b4d361787dc9ca93a5</Sha>
|
||||
<Sha>8bdf7ac23d71d62731dbc0226ee022e5f11a0645</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.21565.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>6d626ff0752a77d339f609b4d361787dc9ca93a5</Sha>
|
||||
<Sha>8bdf7ac23d71d62731dbc0226ee022e5f11a0645</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-preview-20211115-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>68bd10d3aee862a9fbb0bac8b3d474bc323024f3</Sha>
|
||||
<Sha>a413f44a4cba32e6c428cdad33a1b7f7789e7648</Sha>
|
||||
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
@ -146,14 +146,14 @@
|
|||
<Sha>c7d6f9fab845ffd943216da465022744e7d35f22</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.0-preview-21565-02" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>c9eb9dd64e9a2e8a433900a1a626d65a2bce4428</Sha>
|
||||
<Sha>233c037aa97b18982d34d26976e87c677bb013e8</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-preview.1.38" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>078701b97eeef2283c1f4605032b5bcf55a80653</Sha>
|
||||
<Sha>a998efecd431ec8a41536b5ac0152c16f1e2e646</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.100-rtm.21527.8</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-rtm.21527.8</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.200-preview.21565.34</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.21565.34</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -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-preview-20211115-01</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- dependencies for source-build tarball -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644
|
|||
<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>
|
||||
<MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21515.3</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
|
||||
|
|
|
|||
|
|
@ -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,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>
|
||||
|
|
@ -16,12 +16,12 @@ Background Issue: https://github.com/dotnet/source-build/issues/2542
|
|||
6 files changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/eng/Packages.props b/eng/Packages.props
|
||||
index 2de607c5d..1668addc9 100644
|
||||
index 494c9c0..7689042 100644
|
||||
--- a/eng/Packages.props
|
||||
+++ b/eng/Packages.props
|
||||
@@ -46,9 +46,6 @@
|
||||
|
||||
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/>
|
||||
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
|
||||
- </ItemGroup>
|
||||
-
|
||||
|
|
@ -34,7 +34,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'">
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
Loading…
Add table
Reference in a new issue