Skip to content

Commit 5842e12

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge pull request #20148 from dotnet/marcpopMSFT-testimprovements
Update a bunch of test projects to the current target framework
2 parents 7e2c556 + de191ed commit 5842e12

File tree

60 files changed

+148
-117
lines changed

Some content is hidden

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

60 files changed

+148
-117
lines changed

‎src/Assets/TestProjects/AllResourcesInSatellite/AllResourcesInSatellite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
4+
<TargetFrameworks>$(CurrentTargetFramework)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<AssemblyOriginatorKeyFile>test.snk</AssemblyOriginatorKeyFile>
77
<SignAssembly>true</SignAssembly>

‎src/Assets/TestProjects/AllResourcesInSatelliteDisableVersionGenerate/AllResourcesInSatellite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
4+
<TargetFrameworks>$(CurrentTargetFramework)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<AssemblyOriginatorKeyFile>test.snk</AssemblyOriginatorKeyFile>
77
<SignAssembly>true</SignAssembly>

‎src/Assets/TestProjects/AppOutputsExecutablePath/AppOutputsExecutablePath.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
</PropertyGroup>
77

88
</Project>

‎src/Assets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
77
</PropertyGroup>
88
</Project>

‎src/Assets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
7-
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
6+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
7+
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
88
</PropertyGroup>
99
</Project>

‎src/Assets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
<OutputType>Exe</OutputType>
77
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
88
</PropertyGroup>

‎src/Assets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
<OutputType>Exe</OutputType>
77
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
88
</PropertyGroup>

‎src/Assets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<VersionPrefix>1.0.0</VersionPrefix>
6-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>$(CurrentTargetFramework)</TargetFrameworks>
77
<AssemblyName>AppWithDirectDep</AssemblyName>
88
<OutputType>Exe</OutputType>
99
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

‎src/Assets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
<OutputType>Exe</OutputType>
77
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
88
</PropertyGroup>

‎src/Assets/TestProjects/AppWithFallbackFolderToolDependency/AppWithFallbackFolderToolDependency.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
<OutputType>Exe</OutputType>
77
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
88
</PropertyGroup>

‎src/Assets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
7-
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
6+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
7+
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
88
</PropertyGroup>
99
</Project>

‎src/Assets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
7-
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
6+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
7+
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
88
</PropertyGroup>
99
</Project>

‎src/Assets/TestProjects/AppWithLibrary/TestApp/TestApp.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<AssemblyTitle>Test AssemblyTitle</AssemblyTitle>
77
<Copyright>Copyright (c) Test Authors</Copyright>
88
<OutputType>Exe</OutputType>
9-
<TargetFramework>netcoreapp1.1</TargetFramework>
9+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
10+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1011
</PropertyGroup>
1112
<ItemGroup>
1213
<ProjectReference Include="../TestLibrary/TestLibrary.csproj" />

‎src/Assets/TestProjects/AppWithLibraryAndRid/App/App.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
<RuntimeIdentifiers>osx.10.11-x64;osx.10.12-x64;osx.10.14-x64;ubuntu.16.04-x64;ubuntu.14.04-x64;win10-x64;win81-x64</RuntimeIdentifiers>
7+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
78
</PropertyGroup>
89

910
<ItemGroup>

‎src/Assets/TestProjects/AppWithLibraryFS/TestApp/TestApp.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
<FSharpCoreImplicitPackageVersion>4.2.3</FSharpCoreImplicitPackageVersion>
77
</PropertyGroup>
88

‎src/Assets/TestProjects/AppWithLibraryVB/TestApp/TestApp.vbproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AssemblyTitle>Test AssemblyTitle</AssemblyTitle>
77
<Copyright>Copyright (c) Test Authors</Copyright>
88
<OutputType>Exe</OutputType>
9-
<TargetFramework>netcoreapp1.1</TargetFramework>
9+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="../TestLibrary/TestLibrary.vbproj" />

‎src/Assets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFrameworks>net451;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net451;$(CurrentTargetFramework)</TargetFrameworks>
77
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
88
</PropertyGroup>
99

‎src/Assets/TestProjects/AppWithNetCoreAppLib/lib/lib.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>$(CurrentTargetFramework)</TargetFrameworks>
55
</PropertyGroup>
66

77
</Project>

‎src/Assets/TestProjects/AppWithNetCoreAppLib/main/main.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/Assets/TestProjects/AppWithSharedProject/TestApp/TestApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/Assets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
<OutputType>Exe</OutputType>
77
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
88
</PropertyGroup>

‎src/Assets/TestProjects/AppWithTransitiveProjectRefs/TestApp/TestApp.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
5+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
56
</PropertyGroup>
67
<ItemGroup>
78
<ProjectReference Include="..\MainLibrary\MainLibrary.csproj" />

‎src/Assets/TestProjects/AppxReferencingCrossTargeting/Appx/Appx.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp1.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/Assets/TestProjects/AppxReferencingCrossTargeting/CrossTargeted/CrossTargeted.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp1.0;netstandard1.4</TargetFrameworks>
3+
<TargetFrameworks>$(CurrentTargetFramework);netstandard1.4</TargetFrameworks>
44
</PropertyGroup>
55
</Project>

‎src/Assets/TestProjects/ComServer/ComServer.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<PropertyGroup>
33
<Version>42.43.44.45-alpha</Version>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
<EnableComHosting>true</EnableComHosting>
7+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
78
</PropertyGroup>
89
</Project>

‎src/Assets/TestProjects/ComServerWithTypeLibs/ComServerWithTypeLibs.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<Version>42.43.44.45-alpha</Version>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
<EnableComHosting>true</EnableComHosting>
77
<EnableRegFreeCom>true</EnableRegFreeCom>
88
</PropertyGroup>

‎src/Assets/TestProjects/CompilationContext/TestApp/TestApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<PreserveCompilationContext>true</PreserveCompilationContext>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
5+
<TargetFrameworks>net46;$(CurrentTargetFramework)</TargetFrameworks>
66
<RuntimeIdentifier>win7-x86</RuntimeIdentifier>
77
</PropertyGroup>
88
<ItemGroup>

‎src/Assets/TestProjects/CrossTargeting/DesktopAndNetStandard/DesktopAndNetStandard.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.5'">
1616
<Reference Include="System.Windows.Forms" />
17-
<PackageReference Include="Newtonsoft.Json" Version="6.0.4" />
17+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1818
</ItemGroup>
1919
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
2020
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />

‎src/Assets/TestProjects/CrossTargeting/NetStandardAndNetCoreApp/NetStandardAndNetCoreApp.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp1.1;netstandard1.5</TargetFrameworks>
3+
<TargetFrameworks>$(CurrentTargetFramework);netstandard1.5</TargetFrameworks>
44
</PropertyGroup>
5-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
5+
<PropertyGroup Condition="'$(TargetFramework)' != 'netstandard1.5'">
66
<OutputType>exe</OutputType>
77
<DefineConstants>NETCOREAPP;$(DefineConstants)</DefineConstants>
88
<AssetTargetFallback>dnxcore50</AssetTargetFallback>
99
</PropertyGroup>
10-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
10+
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.5'">
1111
<PackageReference Include="Newtonsoft.Json" Version="7.0.1" />
1212
</ItemGroup>
1313
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">

‎src/Assets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<VersionPrefix>1.0.0</VersionPrefix>
6-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>$(CurrentTargetFramework)</TargetFrameworks>
77
<AssemblyName>DependencyContextFromTool</AssemblyName>
88
<OutputType>Exe</OutputType>
99
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

‎src/Assets/TestProjects/DeployProjectReferencingSdkProject/HelloWorld/HelloWorld.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp1.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
</PropertyGroup>
77

88
</Project>

‎src/Assets/TestProjects/FSharpTestAppSimple/TestAppSimple.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
<OutputType>Exe</OutputType>
77
<!-- Issue: https://github.com/dotnet/sdk/issues/1150 -->
88
<DisableImplicitAssetTargetFallback>true</DisableImplicitAssetTargetFallback>

‎src/Assets/TestProjects/InferredTypeVariableName/InferredTypeVaraibleName.vbproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<RootNamespace>InferredTypeVaraibleName</RootNamespace>
6-
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
77
</PropertyGroup>
88

99
</Project>

‎src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
55
<ProjectGuid>{C91F7F4C-47ED-4D1C-8990-B2E886B0FAD9}</ProjectGuid>
66
<EnableDefaultItems>false</EnableDefaultItems>
77
</PropertyGroup>

‎src/Assets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFrameworks>net451;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net451;$(CurrentTargetFramework)</TargetFrameworks>
77
</PropertyGroup>
88

99
</Project>

‎src/Assets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFrameworks>net451;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net451;$(CurrentTargetFramework)</TargetFrameworks>
77
</PropertyGroup>
88

99
<ItemGroup>

‎src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
7-
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
6+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
7+
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
88
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
9+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
910
</PropertyGroup>
1011
</Project>

‎src/Assets/TestProjects/MultiDependentProject/MultiDependentProject.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantAllResourcesInSatellite.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal static void TestSatelliteResources(
5656
.Should()
5757
.Pass();
5858

59-
foreach (var targetFramework in new[] { "net46", "netcoreapp1.1" })
59+
foreach (var targetFramework in new[] { "net46", ToolsetInfo.CurrentTargetFramework })
6060
{
6161
if (targetFramework == "net46" && !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
6262
{
@@ -80,10 +80,11 @@ internal static void TestSatelliteResources(
8080
}
8181
else
8282
{
83+
outputFiles.Add($"AllResourcesInSatellite{EnvironmentInfo.ExecutableExtension}");
84+
outputFiles.Add("ref/AllResourcesInSatellite.dll");
8385
outputFiles.Add("AllResourcesInSatellite.dll");
8486
outputFiles.Add("AllResourcesInSatellite.deps.json");
8587
outputFiles.Add("AllResourcesInSatellite.runtimeconfig.json");
86-
outputFiles.Add("AllResourcesInSatellite.runtimeconfig.dev.json");
8788
command = new DotnetCommand(log, Path.Combine(outputDirectory.FullName, "AllResourcesInSatellite.dll"));
8889
}
8990

‎src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantSatelliteAssembliesHaveassemblyVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private void RestoreAndBuildTestAssets([CallerMemberName] string callingMethod =
3434
.Should()
3535
.Pass();
3636

37-
DirectoryInfo outputDirectory = buildCommand.GetOutputDirectory("netcoreapp1.1");
37+
DirectoryInfo outputDirectory = buildCommand.GetOutputDirectory(ToolsetInfo.CurrentTargetFramework);
3838
_mainAssemblyPath = Path.Combine(outputDirectory.FullName, "AllResourcesInSatellite.dll");
3939
_satelliteAssemblyPath = Path.Combine(outputDirectory.FullName, "en", "AllResourcesInSatellite.resources.dll");
4040
}

0 commit comments

Comments
 (0)