Skip to content

Commit 824ce85

Browse files
wtgodbewtgodbe
authored
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from dotnet/extensions@f63d255 
2 parents d13f769 + db5286c commit 824ce85

File tree

87 files changed

+1780
-161
lines changed

Some content is hidden

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

87 files changed

+1780
-161
lines changed

‎src/Configuration.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.Extensions.Configuration.KeyPerFile.netstandard2.0.cs" />
88
<Reference Include="Microsoft.Extensions.Configuration" />
99
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
1010
</ItemGroup>
11-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
12-
<Compile Include="Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp3.0.cs" />
11+
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
12+
<Compile Include="Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp.cs" />
1313
<Reference Include="Microsoft.Extensions.Configuration" />
1414
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
1515
</ItemGroup>

‎src/Configuration.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp3.0.cs renamed to ‎src/Configuration.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp.cs

File renamed without changes.

‎src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj

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

33
<PropertyGroup>
44
<Description>Configuration provider that uses files in a directory for Microsoft.Extensions.Configuration.</Description>
5-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
77
<IsPackable>true</IsPackable>
88
<IsShipping>true</IsShipping>
99
</PropertyGroup>

‎src/Configuration.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.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.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.Extensions.FileProviders.Embedded.netstandard2.0.cs" />
88
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
99
</ItemGroup>
10-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
11-
<Compile Include="Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.cs" />
10+
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
11+
<Compile Include="Microsoft.Extensions.FileProviders.Embedded.netcoreapp.cs" />
1212
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
1313
</ItemGroup>
1414
</Project>

‎src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.cs renamed to ‎src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.cs

File renamed without changes.

‎src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<PropertyGroup>
44
<RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
55
<Description>File provider for files in embedded resources for Microsoft.Extensions.FileProviders.</Description>
6-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
77
<NuspecFile>$(MSBuildProjectName).multitarget.nuspec</NuspecFile>
8-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
9-
<NuspecFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildProjectName).netcoreapp3.0.nuspec</NuspecFile>
8+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
9+
<NuspecFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildProjectName).netcoreapp.nuspec</NuspecFile>
1010
<IsPackable>true</IsPackable>
1111
<IsShipping>true</IsShipping>
1212
</PropertyGroup>
@@ -27,9 +27,7 @@
2727

2828
<ItemGroup>
2929
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
30-
<NuspecProperty Include="OutputBinary=$(OutputPath)**\$(AssemblyName).dll" />
31-
<NuspecProperty Include="OutputSymbol=$(OutputPath)**\$(AssemblyName).pdb" />
32-
<NuspecProperty Include="OutputDocumentation=$(OutputPath)**\$(AssemblyName).xml" />
30+
<NuspecProperty Include="OutputPath=$(OutputPath)" />
3331
<NuspecProperty Include="TaskAssemblyNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.dll"/>
3432
<NuspecProperty Include="TaskSymbolNetStandard=$(ArtifactsDir)bin\$(AssemblyName).Manifest.Task\$(Configuration)\netstandard2.0\$(AssemblyName).Manifest.Task.pdb" Condition="'$(DebugType)'!='embedded'"/>
3533
</ItemGroup>

‎src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
$CommonMetadataElements$
55
<dependencies>
6-
<group targetFramework=".NETCoreApp3.0">
6+
<group targetFramework=".NETCoreApp3.1">
77
<dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$version$" exclude="Build,Analyzers" />
88
</group>
99
<group targetFramework=".NETStandard2.0">
@@ -14,9 +14,9 @@
1414

1515
<files>
1616
$CommonFileElements$
17-
<file src="$OutputBinary$" target="lib\" />
18-
<file src="$OutputSymbol$" target="lib\" />
19-
<file src="$OutputDocumentation$" target="lib\" />
17+
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
18+
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
19+
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
2020
<file src="build\**\*" target="build\" />
2121
<file src="buildMultiTargeting\**\*" target="buildMultiTargeting\" />
2222
<file src="$TaskAssemblyNetStandard$" target="tasks\netstandard2.0\$AssemblyName$.Manifest.Task.dll" />

‎src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.nuspec renamed to ‎src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<metadata>
44
$CommonMetadataElements$
55
<dependencies>
6-
<group targetFramework=".NETCoreApp3.0">
6+
<group targetFramework=".NETCoreApp3.1">
77
<dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$version$" exclude="Build,Analyzers" />
88
</group>
99
</dependencies>
1010
</metadata>
1111

1212
<files>
1313
$CommonFileElements$
14-
<file src="$OutputBinary$" target="lib\" />
15-
<file src="$OutputSymbol$" target="lib\" />
16-
<file src="$OutputDocumentation$" target="lib\" />
14+
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
15+
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
16+
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
1717
<file src="build\**\*" target="build\" />
1818
<file src="buildMultiTargeting\**\*" target="buildMultiTargeting\" />
1919
<file src="$TaskAssemblyNetStandard$" target="tasks\netstandard2.0\$AssemblyName$.Manifest.Task.dll" />

‎src/FileProviders/Embedded/test/Microsoft.Extensions.FileProviders.Embedded.Tests.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.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)