Skip to content

Commit 1501b1a

Browse files
jeffkljeffkl
authored
Update frameworks for unit and functional tests (#5735)
1 parent ca13cf0 commit 1501b1a

78 files changed

Lines changed: 435 additions & 617 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/DotNetSdkTestVersions.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Each line represents arguments for the .NET SDK installer script (https://learn.microsoft.com/dotnet/core/tools/dotnet-install-script)
2+
-Channel 8.0.3xx -Quality daily

‎build/DotNetSdkVersions.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
# Each line represents arguments for the .NET SDK installer script (https://learn.microsoft.com/dotnet/core/tools/dotnet-install-script)
22
-Channel 8.0
3-
-Channel 7.0
4-
-Channel 6.0 -Runtime dotnet
5-
-Channel 5.0
6-
-Channel 3.1
3+
-Channel 3.1 -Runtime dotnet

‎build/common.project.props‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,40 @@
66
<IsXPlat Condition=" $(MSBuildProjectFullPath.StartsWith('/')) == 'true' OR $(MSBuildProjectFullPath.StartsWith('\')) == 'true' ">true</IsXPlat>
77
</PropertyGroup>
88

9-
<!-- Common -->
9+
<!-- Target Frameworks -->
1010
<PropertyGroup>
11-
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1211
<NETFXTargetFrameworkVersion>v4.7.2</NETFXTargetFrameworkVersion>
1312
<NETFXTargetFramework>net472</NETFXTargetFramework>
14-
<NETCoreTargetFramework>netcoreapp3.1</NETCoreTargetFramework>
15-
<NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net9.0</NETCoreTargetFramework>
16-
<NETCoreTestTargetFrameworks>net8.0</NETCoreTestTargetFrameworks>
1713
<NetStandardVersion>netstandard2.0</NetStandardVersion>
18-
<TargetFrameworksExe>$(NETFXTargetFramework);$(NETCoreTargetFramework)</TargetFrameworksExe>
19-
<TargetFrameworksExe Condition="'$(IsXPlat)' == 'true'">$(NETCoreTargetFramework)</TargetFrameworksExe>
20-
<TargetFrameworksExeForSigning>$(TargetFrameworksExe);netcoreapp5.0</TargetFrameworksExeForSigning>
21-
<TargetFrameworksExeForSigning Condition=" '$(IsXPlat)' == 'true' ">$(NETCoreTargetFramework);netcoreapp5.0</TargetFrameworksExeForSigning>
22-
<TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe)</TargetFrameworksExeForSigning>
23-
<MinimalTargetFrameworksExeSigning>$(NETFXTargetFramework);net7.0</MinimalTargetFrameworksExeSigning>
24-
<MinimalTargetFrameworksExeSigning Condition=" '$(IsXPlat)' == 'true' ">net7.0</MinimalTargetFrameworksExeSigning>
25-
<MinimalTargetFrameworksExeSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework)</MinimalTargetFrameworksExeSigning>
26-
<TargetFrameworksLibrary>$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
27-
<TargetFrameworksLibrary Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
28-
<TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);netcoreapp5.0</TargetFrameworksLibraryForSigning>
29-
<TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksLibrary)</TargetFrameworksLibraryForSigning>
30-
<TargetFrameworksLibraryForCrossVerificationTests>$(NETFXTargetFramework);$(NETCoreTestTargetFrameworks)</TargetFrameworksLibraryForCrossVerificationTests>
14+
<NETCoreTargetFramework>net8.0</NETCoreTargetFramework>
15+
<NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net9.0</NETCoreTargetFramework>
16+
<NETCoreLegacyTargetFramework>netcoreapp3.1</NETCoreLegacyTargetFramework>
17+
<NETCoreLegacyTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net9.0</NETCoreLegacyTargetFramework>
18+
<NETCoreLegacyTargetFrameworkForSigning>netcoreapp5.0</NETCoreLegacyTargetFrameworkForSigning>
19+
20+
<!-- Target frameworks for class libraries-->
21+
<TargetFrameworksLibrary>$(NetStandardVersion)</TargetFrameworksLibrary>
22+
<TargetFrameworksLibrary Condition="'$(IsXPlat)' != 'true' And '$(DotNetBuildFromSource)' != 'true'">$(NETFXTargetFramework);$(TargetFrameworksLibrary)</TargetFrameworksLibrary>
23+
24+
<!-- Target frameworks for class libraries which require signing APIs which need to target NET 5.0 -->
25+
<TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary)</TargetFrameworksLibraryForSigning>
26+
<TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' != 'true'">$(TargetFrameworksLibraryForSigning);$(NETCoreLegacyTargetFrameworkForSigning)</TargetFrameworksLibraryForSigning>
27+
28+
<!-- Target framework for runnable apps -->
29+
<TargetFrameworksExe>$(NETCoreTargetFramework)</TargetFrameworksExe>
30+
<TargetFrameworksExe Condition="'$(IsXPlat)' != 'true' And '$(DotNetBuildFromSource)' != 'true'">$(NETFXTargetFramework);$(TargetFrameworksExe)</TargetFrameworksExe>
31+
32+
<!-- Target frameworks for unit tests -->
33+
<TargetFrameworksUnitTest>$(NETCoreTargetFramework)</TargetFrameworksUnitTest>
34+
<TargetFrameworksUnitTest Condition="'$(IsXPlat)' != 'true' And '$(DotNetBuildFromSource)' != 'true'">$(NETFXTargetFramework);$(TargetFrameworksUnitTest)</TargetFrameworksUnitTest>
35+
36+
<!-- Target frameworks for unit tests that test libaries using signing APIs -->
37+
<TargetFrameworksUnitTestForSigning>$(NETCoreTargetFramework)</TargetFrameworksUnitTestForSigning>
38+
<TargetFrameworksUnitTestForSigning Condition="'$(IsXPlat)' != 'true' And '$(DotNetBuildFromSource)' != 'true'">$(NETFXTargetFramework);$(TargetFrameworksUnitTestForSigning);$(NETCoreLegacyTargetFramework)</TargetFrameworksUnitTestForSigning>
39+
</PropertyGroup>
40+
41+
<!-- Common -->
42+
<PropertyGroup>
3143
<RepositoryRootDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\</RepositoryRootDirectory>
3244
<BuildCommonDirectory>$(RepositoryRootDirectory)build\</BuildCommonDirectory>
3345
<SolutionFile>$(RepositoryRootDirectory)$(RepositoryName).sln</SolutionFile>

‎build/common.ps1‎

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
### Constants ###
22
$NuGetClientRoot = Split-Path -Path $PSScriptRoot -Parent
33
$CLIRoot = Join-Path $NuGetClientRoot cli
4+
$DotNetInstall = Join-Path $CLIRoot 'dotnet-install.ps1'
5+
$SdkTestingRoot = Join-Path $NuGetClientRoot ".test\dotnet"
46
$Artifacts = Join-Path $NuGetClientRoot artifacts
57
$Nupkgs = Join-Path $Artifacts nupkgs
68
$ConfigureJson = Join-Path $Artifacts configure.json
@@ -146,15 +148,12 @@ Function Update-Submodules {
146148
}
147149
}
148150

149-
Function Install-DotnetCLI {
151+
Function Download-DotNetInstallScript {
150152
[CmdletBinding()]
151153
param(
152-
[switch]$Force,
153-
[switch]$SkipDotnetInfo
154+
[switch]$Force
154155
)
155156

156-
$DotNetInstall = Join-Path $CLIRoot 'dotnet-install.ps1'
157-
158157
#If "-force" is specified, or dotnet.exe under cli folder doesn't exist, create cli folder and download dotnet-install.ps1 into cli folder.
159158
if ($Force -or -not (Test-Path $DotNetExe)) {
160159
Trace-Log "Downloading .NET CLI install script"
@@ -163,6 +162,16 @@ Function Install-DotnetCLI {
163162

164163
Download-FileWithRetry 'https://dot.net/v1/dotnet-install.ps1' -OutFile $DotNetInstall
165164
}
165+
}
166+
167+
Function Install-DotnetCLI {
168+
[CmdletBinding()]
169+
param(
170+
[switch]$Force,
171+
[switch]$SkipDotnetInfo
172+
)
173+
174+
Download-DotNetInstallScript -Force:$Force
166175

167176
if (-not ([string]::IsNullOrEmpty($env:DOTNET_SDK_VERSIONS))) {
168177
Trace-Log "Using environment variable DOTNET_SDK_VERSIONS instead of DotNetSdkVersions.txt. Value: '$env:DOTNET_SDK_VERSIONS'"
@@ -177,16 +186,9 @@ Function Install-DotnetCLI {
177186
continue
178187
}
179188

180-
if ([Environment]::Is64BitOperatingSystem) {
181-
$arch = "x64";
182-
}
183-
else {
184-
$arch = "x86";
185-
}
186-
187-
Trace-Log "$DotNetInstall $CliBranch -InstallDir $CLIRoot -Architecture $arch -NoPath"
189+
Trace-Log "$DotNetInstall $CliBranch -InstallDir $CLIRoot -NoPath"
188190

189-
& powershell $DotNetInstall $CliBranch -InstallDir $CLIRoot -Architecture $arch -NoPath
191+
& powershell $DotNetInstall $CliBranch -InstallDir $CLIRoot -NoPath
190192
if ($LASTEXITCODE -ne 0)
191193
{
192194
throw "dotnet-install.ps1 exited with non-zero exit code"
@@ -219,6 +221,44 @@ Function Install-DotnetCLI {
219221
}
220222
}
221223

224+
Function Install-DotNetSdksForTesting {
225+
[CmdletBinding()]
226+
param(
227+
[switch]$Force
228+
)
229+
230+
Download-DotNetInstallScript -Force:$Force
231+
232+
if (-not ([string]::IsNullOrEmpty($env:DOTNET_SDK_TEST_VERSIONS))) {
233+
Trace-Log "Using environment variable DOTNET_SDK_TEST_VERSIONS instead of DotNetSdkTestVersions.txt. Value: '$env:DOTNET_SDK_TEST_VERSIONS'"
234+
$SdkList = $env:DOTNET_SDK_TEST_VERSIONS -Split ";"
235+
} else {
236+
$SdkList = (Get-Content -Path "$NuGetClientRoot\build\DotNetSdkTestVersions.txt")
237+
}
238+
239+
ForEach ($SdkItem in $SdkList) {
240+
$SdkItem = $SdkItem.trim()
241+
if ($SdkItem.StartsWith("#") -or $SdkItem.Equals("")) {
242+
continue
243+
}
244+
245+
if ([Environment]::Is64BitOperatingSystem) {
246+
$arch = "x64";
247+
}
248+
else {
249+
$arch = "x86";
250+
}
251+
252+
Trace-Log "$DotNetInstall $SdkItem -InstallDir $SdkTestingRoot -Architecture $arch -NoPath"
253+
254+
& powershell $DotNetInstall $SdkItem -InstallDir $SdkTestingRoot -Architecture $arch -NoPath
255+
if ($LASTEXITCODE -ne 0)
256+
{
257+
throw "dotnet-install.ps1 exited with non-zero exit code"
258+
}
259+
}
260+
}
261+
222262
Function Get-LatestVisualStudioRoot {
223263
if (Test-Path $BuiltInVsWhereExe) {
224264
$installationPath = & $BuiltInVsWhereExe -latest -prerelease -property installationPath

‎build/common.targets‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0">
33
<!-- Compiler flags -->
4-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NETFXTargetFramework)' ">
5-
<DefineConstants>$(DefineConstants);IS_DESKTOP</DefineConstants>
6-
<IsDesktop>true</IsDesktop>
7-
</PropertyGroup>
8-
9-
<PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) OR $(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('net6')) OR $(TargetFramework.StartsWith('net7')) OR $(TargetFramework.StartsWith('net8')) OR $(TargetFramework.StartsWith('net9')) ">
10-
<DefineConstants>$(DefineConstants);IS_CORECLR</DefineConstants>
11-
<IsCore>true</IsCore>
12-
</PropertyGroup>
13-
14-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp5.0' ">
15-
<DefineConstants>$(DefineConstants);NETCORE5_0</DefineConstants>
16-
</PropertyGroup>
17-
184
<PropertyGroup>
19-
<SigningNotSupported Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1'">true</SigningNotSupported>
20-
<SigningNotSupported Condition=" '$(SigningNotSupported)' != 'true'">false</SigningNotSupported>
21-
</PropertyGroup>
22-
23-
<PropertyGroup Condition=" '$(SigningNotSupported)' != 'true' ">
24-
<DefineConstants>$(DefineConstants);IS_SIGNING_SUPPORTED</DefineConstants>
5+
<DefineConstants Condition="'$(TargetFramework)' == '$(NETFXTargetFramework)'">$(DefineConstants);IS_DESKTOP</DefineConstants>
6+
<DefineConstants Condition="'$(TargetFramework)' != '$(NETFXTargetFramework)'">$(DefineConstants);IS_CORECLR</DefineConstants>
7+
<DefineConstants Condition="'$(TargetFramework)' != '$(NetStandardVersion)' And '$(TargetFramework)' != '$(NETCoreLegacyTargetFramework)'">$(DefineConstants);IS_SIGNING_SUPPORTED</DefineConstants>
258
</PropertyGroup>
269

2710
<!-- Include shared files for netcore projects -->
@@ -365,8 +348,8 @@ Condition=" ('%(Extension)' == '.dll' OR '%(Filename)' == 'NuGet.CommandLine.XPl
365348

366349
<ItemGroup>
367350
<TestAssemblyPath Include="$(AbsoluteTestAssemblyPath)">
368-
<IsDesktop Condition=" '$(IsDesktop)' == 'true' ">true</IsDesktop>
369-
<IsCore Condition=" '$(IsDesktop)' != 'true' ">true</IsCore>
351+
<IsDesktop Condition=" '$(TargetFramework)' == '$(NETFXTargetFramework)' ">true</IsDesktop>
352+
<IsCore Condition=" '$(TargetFramework)' != '$(NETFXTargetFramework)' ">true</IsCore>
370353
</TestAssemblyPath>
371354
</ItemGroup>
372355
</Target>

‎configure.ps1‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ Invoke-BuildStep 'Installing .NET CLI' {
5555
Install-DotnetCLI -Force:$Force -SkipDotnetInfo:$SkipDotnetInfo
5656
} -ev +BuildErrors
5757

58+
Invoke-BuildStep 'Installing .NET SDKs for functional tests' {
59+
Install-DotNetSdksForTesting -Force:$Force
60+
} -ev +BuildErrors
61+
5862
Invoke-BuildStep 'Cleaning package cache' {
5963
Clear-PackageCache
6064
} -skip:(-not $CleanCache) -ev +BuildErrors

‎configure.sh‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,41 @@ fi
6666

6767
echo "=================================================================="
6868

69+
NETSDK_FOR_TESTING_DIR="$(pwd)/.test/dotnet"
70+
71+
# If the DOTNET_SDK_TEST_VERSIONS environment variable is set, use its value instead of the ones in DotNetSdkTestVersions.txt
72+
if [ "$DOTNET_SDK_TEST_VERSIONS" != "" ]; then
73+
echo "Using environment variable DOTNET_SDK_TEST_VERSIONS instead of DotNetSdkTestVersions.txt. Value: '$DOTNET_SDK_TEST_VERSIONS'"
74+
IFS=';' read -ra array <<< "$DOTNET_SDK_TEST_VERSIONS"
75+
for CliArgs in "${array[@]}";
76+
do
77+
echo "Installing .NET SDKs for functional tests..."
78+
echo "'cli/dotnet-install.sh -InstallDir $NETSDK_FOR_TESTING_DIR -NoPath $CliArgs'"
79+
80+
cli/dotnet-install.sh -InstallDir $NETSDK_FOR_TESTING_DIR -NoPath $CliArgs
81+
if (( $? )); then
82+
echo "The .NET SDK install failed!"
83+
return 1
84+
fi
85+
done
86+
else
87+
# Get CLI Branches for testing
88+
cat build/DotNetSdkTestVersions.txt | while IFS=$'\r' read -r CliArgs || [[ -n $line ]];
89+
do
90+
if [ "${CliArgs:0:1}" != "#" ] || [ "$CliArgs" == "" ]; then
91+
echo "'cli/dotnet-install.sh -InstallDir $NETSDK_FOR_TESTING_DIR -NoPath $CliArgs'"
92+
93+
cli/dotnet-install.sh -InstallDir $NETSDK_FOR_TESTING_DIR -NoPath $CliArgs
94+
if (( $? )); then
95+
echo "The .NET SDK install failed!"
96+
return 1
97+
fi
98+
fi
99+
done
100+
fi
101+
102+
echo "=================================================================="
103+
69104
echo "Initializing submodules..."
70105
git submodule init
71106
git submodule update

‎eng/pipelines/templates/CrossFramework_Tests_On_Windows.yml‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@ steps:
1919
arguments: "-Force -CleanCache"
2020

2121
- task: MSBuild@1
22-
displayName: "Restore for VS2019"
22+
displayName: "Restore"
2323
inputs:
24-
solution: "build\\build.proj"
24+
solution: '$(Build.Repository.LocalPath)\\test\\NuGet.Core.FuncTests\\NuGet.Signing.CrossFramework.Test\\NuGet.Signing.CrossFramework.Test.csproj'
2525
configuration: "$(BuildConfiguration)"
26-
msbuildArguments: "/restore:false /target:RestoreVS /property:BuildNumber=$(BuildNumber) /property:BuildRTM=false /binarylogger:$(Build.StagingDirectory)\\binlog\\01.Restore.binlog"
26+
msbuildArguments: "/target:Restore /property:BuildNumber=$(BuildNumber) /binarylogger:$(Build.StagingDirectory)\\binlog\\01.Restore.binlog"
2727

2828
- task: MSBuild@1
29-
displayName: "BuildNoVSIX"
30-
continueOnError: "true"
29+
displayName: "Build"
3130
inputs:
32-
solution: "build\\build.proj"
31+
solution: '$(Build.Repository.LocalPath)\\test\\NuGet.Core.FuncTests\\NuGet.Signing.CrossFramework.Test\\NuGet.Signing.CrossFramework.Test.csproj'
3332
configuration: "$(BuildConfiguration)"
34-
msbuildArguments: "/restore:false /target:BuildNoVSIX /property:BuildRTM=false /property:BuildNumber=$(BuildNumber) /binarylogger:$(Build.StagingDirectory)\\binlog\\02.Build.binlog"
33+
msbuildArguments: "/restore:false /property:BuildNumber=$(BuildNumber) /binarylogger:$(Build.StagingDirectory)\\binlog\\02.Build.binlog"
3534

3635
- task: DotNetCoreCLI@2
3736
displayName: "Run Cross Verify Tests (.NET Framework)"
@@ -42,16 +41,6 @@ steps:
4241
arguments: '--no-restore --no-build --framework net472 --settings:$(Build.Repository.LocalPath)\build\xunit.runsettings /noautorsp /property:Configuration=$(BuildConfiguration) "/binarylogger:$(Build.StagingDirectory)\\binlog\\03.Test-net472.binlog"'
4342
testRunTitle: 'NuGet.Client Cross Verify Tests On Windows (.NET Framework)'
4443

45-
- task: DotNetCoreCLI@2
46-
displayName: "Run Cross Verify Tests (.NET 7.0)"
47-
continueOnError: ${{ eq(variables['IsOfficialBuild'], 'true') }}
48-
inputs:
49-
command: 'test'
50-
projects: '$(Build.Repository.LocalPath)\test\NuGet.Core.FuncTests\NuGet.Signing.CrossFramework.Test\NuGet.Signing.CrossFramework.Test.csproj'
51-
arguments: '--no-restore --no-build --framework net7.0 --settings:$(Build.Repository.LocalPath)\build\xunit.runsettings /noautorsp /property:Configuration=$(BuildConfiguration) "/binarylogger:$(Build.StagingDirectory)\\binlog\\03.Test-net7.0.binlog"'
52-
testRunTitle: 'NuGet.Client Cross Verify Tests On Windows (.NET 7.0)'
53-
condition: "succeededOrFailed()"
54-
5544
- task: DotNetCoreCLI@2
5645
displayName: "Run Cross Verify Tests (.NET 8.0)"
5746
continueOnError: ${{ eq(variables['IsOfficialBuild'], 'true') }}
@@ -69,4 +58,4 @@ steps:
6958
inlineScript: |
7059
. $(Build.Repository.LocalPath)\\scripts\\utils\\PostGitCommitStatus.ps1
7160
SetCommitStatusForTestResult -PersonalAccessToken $(NuGetLurkerPersonalAccessToken) -CommitSha $(Build.SourceVersion) -VstsPersonalAccessToken $(System.AccessToken) -TestName "$env:AGENT_JOBNAME"
72-
condition: "not(eq(variables['ManualGitHubChecks'], 'false'))"
61+
condition: "not(eq(variables['ManualGitHubChecks'], 'false'))"

‎src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@
101101
</Content>
102102
</ItemGroup>
103103

104-
<ItemGroup>
105-
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
106-
</ItemGroup>
107-
108104
<ItemGroup>
109105
<None Include="Resources\PackageIconMonikers.imagemanifest">
110106
<AutoGen>True</AutoGen>

‎src/NuGet.Core/Microsoft.Build.NuGetSdkResolver/Microsoft.Build.NuGetSdkResolver.csproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>$(MinimalTargetFrameworksExeSigning)</TargetFrameworks>
4-
<TargetFramework />
3+
<TargetFrameworks Condition="'$(IsVsixBuild)' != 'true'">$(TargetFrameworksExe)</TargetFrameworks>
4+
<TargetFramework Condition="'$(IsVsixBuild)' == 'true'">$(NETFXTargetFramework)</TargetFramework>
55
<Shipping>true</Shipping>
66
<IncludeInVSIX>true</IncludeInVSIX>
77
<PackProject>true</PackProject>
@@ -10,11 +10,6 @@
1010
<NoWarn>$(NoWarn);RS0041</NoWarn>
1111
</PropertyGroup>
1212

13-
<PropertyGroup Condition=" '$(IsVsixBuild)' == 'true' ">
14-
<TargetFrameworks />
15-
<TargetFramework>$(NETFXTargetFramework)</TargetFramework>
16-
</PropertyGroup>
17-
1813
<ItemGroup>
1914
<ProjectReference Include="..\NuGet.Commands\NuGet.Commands.csproj" />
2015
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />

0 commit comments

Comments
 (0)