diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 805e947626c46..cb644757a2d95 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -111,10 +111,11 @@ - + true + '$(IsTestSupportProject)' != 'true' and + '$(IsGeneratorProject)' != 'true'">true diff --git a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj index ea2db0cad1715..1bfbbdc781d94 100644 --- a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj @@ -1,6 +1,8 @@ + $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum) + true @@ -9,7 +11,8 @@ - - + + + \ No newline at end of file diff --git a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj index 952695ba3d4b5..e55f185fd8f0a 100644 --- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -1,4 +1,5 @@ + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppPrevious)-windows;$(NetCoreAppPrevious);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum) true @@ -93,7 +94,8 @@ System.Security.Cryptography.X509Certificates.X509SelectionFlag - - + + + diff --git a/src/libraries/apicompat/ApiCompat.proj b/src/libraries/apicompat/ApiCompat.proj index 8d799d960b98e..06c48f5cd57af 100644 --- a/src/libraries/apicompat/ApiCompat.proj +++ b/src/libraries/apicompat/ApiCompat.proj @@ -33,7 +33,6 @@ - @@ -42,18 +41,52 @@ + + + + + + + + + + + - + + @@ -68,7 +101,8 @@ ExcludeAttributesFiles="@(ApiCompatExcludeAttributesFile)" LeftAssembliesTransformationPattern="@(ApiCompatNetCoreAppLatestStableLeftAssembliesTransformationPattern)" RightAssembliesTransformationPattern="@(ApiCompatNetCoreAppCurrentRightAssembliesTransformationPattern)" - RightAssembliesReferences="@(ApiCompatRightAssemblyReference)" /> + LeftAssembliesReferences="@(ApiCompatNetCoreAppLatestStableAssemblyReference, ',')" + RightAssembliesReferences="@(ApiCompatRightAssemblyReference, ',')" /> + RightAssembliesReferences="@(ApiCompatRightAssemblyReference, ',')" /> + RightAssembliesReferences="@(ApiCompatRightAssemblyReference, ',')" /> - - - false - $(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libraries/oob.proj b/src/libraries/oob.proj index 40bacbec87646..3f7031edf7778 100644 --- a/src/libraries/oob.proj +++ b/src/libraries/oob.proj @@ -7,10 +7,8 @@ - - @@ -23,15 +21,11 @@ - - - - diff --git a/src/libraries/sfx-ref.proj b/src/libraries/sfx-ref.proj index 7d6da7a806cbc..984b1fe2dea03 100644 --- a/src/libraries/sfx-ref.proj +++ b/src/libraries/sfx-ref.proj @@ -17,4 +17,12 @@ System.Private.CoreLib\ref\System.Private.CoreLib.csproj" /> + + + + + + + + diff --git a/src/libraries/sfx-src.proj b/src/libraries/sfx-src.proj index 8e7679dac15eb..934f31e43ffb6 100644 --- a/src/libraries/sfx-src.proj +++ b/src/libraries/sfx-src.proj @@ -15,7 +15,8 @@ Exclude="@(NetCoreAppLibrary->'%(Identity)\src\%(Identity).csproj'); Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj" /> diff --git a/src/libraries/sfx.proj b/src/libraries/sfx.proj index d4f4c5bd57db1..d3c0ed4e6a85b 100644 --- a/src/libraries/sfx.proj +++ b/src/libraries/sfx.proj @@ -1,8 +1,12 @@ + + $(NetCoreAppCurrent)-$(TargetOS) false + false + $(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml @@ -11,16 +15,47 @@ SharedFrameworkAssembly + + - - - - + + + + + + + + + + + - + + + + + + + + + + + - - - $(NetCoreAppCurrent)-$(TargetOS) - - - - - - - - - - - - - - - diff --git a/src/libraries/shims/Directory.Build.targets b/src/libraries/shims/Directory.Build.targets deleted file mode 100644 index c04623e335943..0000000000000 --- a/src/libraries/shims/Directory.Build.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/libraries/shims/System.Configuration/src/System.Configuration.csproj b/src/libraries/shims/System.Configuration/src/System.Configuration.csproj index 1115b526f5eb7..e9274e98d7281 100644 --- a/src/libraries/shims/System.Configuration/src/System.Configuration.csproj +++ b/src/libraries/shims/System.Configuration/src/System.Configuration.csproj @@ -6,9 +6,9 @@ - - + + diff --git a/src/libraries/shims/System.Core/src/System.Core.csproj b/src/libraries/shims/System.Core/src/System.Core.csproj index 0fe3ba39c41c4..5fe9560bfd0b3 100644 --- a/src/libraries/shims/System.Core/src/System.Core.csproj +++ b/src/libraries/shims/System.Core/src/System.Core.csproj @@ -7,19 +7,19 @@ - - - + - + + - + + diff --git a/src/libraries/shims/System.Data/Directory.Build.props b/src/libraries/shims/System.Data/Directory.Build.props index a051b0fdfeb49..a1e089c58933b 100644 --- a/src/libraries/shims/System.Data/Directory.Build.props +++ b/src/libraries/shims/System.Data/Directory.Build.props @@ -5,16 +5,6 @@ 4.0.0.0 ECMA - netcoreapp2.1 - - net6.0 - - - - - - diff --git a/src/libraries/shims/System.Data/ref/System.Data.csproj b/src/libraries/shims/System.Data/ref/System.Data.csproj index f826056a99fae..039168e0f0441 100644 --- a/src/libraries/shims/System.Data/ref/System.Data.csproj +++ b/src/libraries/shims/System.Data/ref/System.Data.csproj @@ -2,10 +2,11 @@ - - - + + + + \ No newline at end of file diff --git a/src/libraries/shims/System.Data/src/System.Data.csproj b/src/libraries/shims/System.Data/src/System.Data.csproj index dac2634334b47..24614f5bb45ff 100644 --- a/src/libraries/shims/System.Data/src/System.Data.csproj +++ b/src/libraries/shims/System.Data/src/System.Data.csproj @@ -7,10 +7,11 @@ - - - + + + + diff --git a/src/libraries/shims/System.Drawing/src/System.Drawing.csproj b/src/libraries/shims/System.Drawing/src/System.Drawing.csproj index 31d9400b50e76..d880083fdbedc 100644 --- a/src/libraries/shims/System.Drawing/src/System.Drawing.csproj +++ b/src/libraries/shims/System.Drawing/src/System.Drawing.csproj @@ -7,16 +7,11 @@ - - - - - - - - + + + diff --git a/src/libraries/shims/System.Net/src/System.Net.csproj b/src/libraries/shims/System.Net/src/System.Net.csproj index b8aa8ec8ad1cb..49010cebd2ce5 100644 --- a/src/libraries/shims/System.Net/src/System.Net.csproj +++ b/src/libraries/shims/System.Net/src/System.Net.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/libraries/shims/System.Runtime.Serialization/src/System.Runtime.Serialization.csproj b/src/libraries/shims/System.Runtime.Serialization/src/System.Runtime.Serialization.csproj index 730bc664d2c14..32255729ca2d6 100644 --- a/src/libraries/shims/System.Runtime.Serialization/src/System.Runtime.Serialization.csproj +++ b/src/libraries/shims/System.Runtime.Serialization/src/System.Runtime.Serialization.csproj @@ -6,11 +6,11 @@ - - + + diff --git a/src/libraries/shims/System.Security/src/System.Security.csproj b/src/libraries/shims/System.Security/src/System.Security.csproj index 12368499130b4..d42370e2fb660 100644 --- a/src/libraries/shims/System.Security/src/System.Security.csproj +++ b/src/libraries/shims/System.Security/src/System.Security.csproj @@ -7,10 +7,11 @@ - - - - + + + + + diff --git a/src/libraries/shims/System.ServiceModel.Web/src/System.ServiceModel.Web.csproj b/src/libraries/shims/System.ServiceModel.Web/src/System.ServiceModel.Web.csproj index 9d6657a3c5086..882640de5f62e 100644 --- a/src/libraries/shims/System.ServiceModel.Web/src/System.ServiceModel.Web.csproj +++ b/src/libraries/shims/System.ServiceModel.Web/src/System.ServiceModel.Web.csproj @@ -6,9 +6,9 @@ - - + + diff --git a/src/libraries/shims/System.ServiceProcess/src/System.ServiceProcess.csproj b/src/libraries/shims/System.ServiceProcess/src/System.ServiceProcess.csproj index d0d6ae56088a0..8945138546a14 100644 --- a/src/libraries/shims/System.ServiceProcess/src/System.ServiceProcess.csproj +++ b/src/libraries/shims/System.ServiceProcess/src/System.ServiceProcess.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/libraries/shims/System.Transactions/src/System.Transactions.csproj b/src/libraries/shims/System.Transactions/src/System.Transactions.csproj index 22f9ef0a0a711..367db2735e3fc 100644 --- a/src/libraries/shims/System.Transactions/src/System.Transactions.csproj +++ b/src/libraries/shims/System.Transactions/src/System.Transactions.csproj @@ -7,8 +7,8 @@ - + diff --git a/src/libraries/shims/System/ref/System.csproj b/src/libraries/shims/System/ref/System.csproj index c8d1ae3b399f5..0e2d55553bd9a 100644 --- a/src/libraries/shims/System/ref/System.csproj +++ b/src/libraries/shims/System/ref/System.csproj @@ -2,27 +2,21 @@ - - - - + - - + - - @@ -36,18 +30,24 @@ - + - + - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/System/src/System.csproj b/src/libraries/shims/System/src/System.csproj index 14ebdbd7091a0..f744ee95da231 100644 --- a/src/libraries/shims/System/src/System.csproj +++ b/src/libraries/shims/System/src/System.csproj @@ -7,27 +7,21 @@ - - - - + - - + - - @@ -41,19 +35,25 @@ - + - + - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/WindowsBase/src/WindowsBase.csproj b/src/libraries/shims/WindowsBase/src/WindowsBase.csproj index 4bc182120606c..fafb9561febf8 100644 --- a/src/libraries/shims/WindowsBase/src/WindowsBase.csproj +++ b/src/libraries/shims/WindowsBase/src/WindowsBase.csproj @@ -6,10 +6,10 @@ - - + + diff --git a/src/libraries/shims/mscorlib/ref/mscorlib.csproj b/src/libraries/shims/mscorlib/ref/mscorlib.csproj index 9369286d0e670..52c0664c54483 100644 --- a/src/libraries/shims/mscorlib/ref/mscorlib.csproj +++ b/src/libraries/shims/mscorlib/ref/mscorlib.csproj @@ -5,7 +5,6 @@ - @@ -27,15 +26,15 @@ - - + + diff --git a/src/libraries/shims/mscorlib/src/mscorlib.csproj b/src/libraries/shims/mscorlib/src/mscorlib.csproj index deba26a6dfe7e..9b5d4f70ae284 100644 --- a/src/libraries/shims/mscorlib/src/mscorlib.csproj +++ b/src/libraries/shims/mscorlib/src/mscorlib.csproj @@ -10,7 +10,6 @@ - @@ -21,18 +20,18 @@ - + - - + + diff --git a/src/libraries/shims/stubs/Directory.Build.props b/src/libraries/shims/stubs/Directory.Build.props new file mode 100644 index 0000000000000..60dcac3da5543 --- /dev/null +++ b/src/libraries/shims/stubs/Directory.Build.props @@ -0,0 +1,36 @@ + + + + $(MSBuildProjectName)$([System.IO.Path]::DirectorySeparatorChar)stub + + + + + + $(NetCoreAppCurrent) + + false + false + false + false + false + false + true + false + none + false + + + + + + <_Parameter1>(System.Reflection.AssemblyNameFlags)0x70 + <_Parameter1_IsLiteral>true + + + + + + + + diff --git a/src/libraries/shims/stubs/Directory.Build.targets b/src/libraries/shims/stubs/Directory.Build.targets new file mode 100644 index 0000000000000..227c169e5eadb --- /dev/null +++ b/src/libraries/shims/stubs/Directory.Build.targets @@ -0,0 +1,38 @@ + + + + + + $(IntermediateOutputPath)$(MSBuildProjectName).ForwardedTypes.cs + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/shims/stubs/Microsoft.Win32.SystemEvents.csproj b/src/libraries/shims/stubs/Microsoft.Win32.SystemEvents.csproj new file mode 100644 index 0000000000000..8ace931ea0372 --- /dev/null +++ b/src/libraries/shims/stubs/Microsoft.Win32.SystemEvents.csproj @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/README.md b/src/libraries/shims/stubs/README.md new file mode 100644 index 0000000000000..c07aa4ddb22b0 --- /dev/null +++ b/src/libraries/shims/stubs/README.md @@ -0,0 +1,3 @@ +# .NETCoreApp type forwarded stub assemblies + +The projects under this directory are type forwarded stub assemblies, used by the .NETCoreApp shims (and System.Windows.Extensions) to compile type forwards against types that aren't part of the Microsoft.NETCore.App shared framework. \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.CodeDom.csproj b/src/libraries/shims/stubs/System.CodeDom.csproj new file mode 100644 index 0000000000000..959b7506146ff --- /dev/null +++ b/src/libraries/shims/stubs/System.CodeDom.csproj @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Configuration.ConfigurationManager.csproj b/src/libraries/shims/stubs/System.Configuration.ConfigurationManager.csproj new file mode 100644 index 0000000000000..9f16e239985f1 --- /dev/null +++ b/src/libraries/shims/stubs/System.Configuration.ConfigurationManager.csproj @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Data.Odbc.csproj b/src/libraries/shims/stubs/System.Data.Odbc.csproj new file mode 100644 index 0000000000000..61a1a0ac111f8 --- /dev/null +++ b/src/libraries/shims/stubs/System.Data.Odbc.csproj @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Data.OleDb.csproj b/src/libraries/shims/stubs/System.Data.OleDb.csproj new file mode 100644 index 0000000000000..c296fe8d77054 --- /dev/null +++ b/src/libraries/shims/stubs/System.Data.OleDb.csproj @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Data.SqlClient.csproj b/src/libraries/shims/stubs/System.Data.SqlClient.csproj new file mode 100644 index 0000000000000..81c4e4e5d32c8 --- /dev/null +++ b/src/libraries/shims/stubs/System.Data.SqlClient.csproj @@ -0,0 +1,62 @@ + + + + Microsoft + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Diagnostics.EventLog.csproj b/src/libraries/shims/stubs/System.Diagnostics.EventLog.csproj new file mode 100644 index 0000000000000..1a27d1085eda8 --- /dev/null +++ b/src/libraries/shims/stubs/System.Diagnostics.EventLog.csproj @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/shims/stubs/System.Diagnostics.PerformanceCounter.csproj new file mode 100644 index 0000000000000..0560d8f8b4feb --- /dev/null +++ b/src/libraries/shims/stubs/System.Diagnostics.PerformanceCounter.csproj @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Drawing.Common.csproj b/src/libraries/shims/stubs/System.Drawing.Common.csproj new file mode 100644 index 0000000000000..fe7ccf5202fc3 --- /dev/null +++ b/src/libraries/shims/stubs/System.Drawing.Common.csproj @@ -0,0 +1,161 @@ + + + + + $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum) + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.IO.Packaging.csproj b/src/libraries/shims/stubs/System.IO.Packaging.csproj new file mode 100644 index 0000000000000..fabc41823fd7b --- /dev/null +++ b/src/libraries/shims/stubs/System.IO.Packaging.csproj @@ -0,0 +1,25 @@ + + + + Microsoft + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.IO.Ports.csproj b/src/libraries/shims/stubs/System.IO.Ports.csproj new file mode 100644 index 0000000000000..989dca22d6b5b --- /dev/null +++ b/src/libraries/shims/stubs/System.IO.Ports.csproj @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Runtime.Serialization.Schema.csproj b/src/libraries/shims/stubs/System.Runtime.Serialization.Schema.csproj new file mode 100644 index 0000000000000..5764aff5d2288 --- /dev/null +++ b/src/libraries/shims/stubs/System.Runtime.Serialization.Schema.csproj @@ -0,0 +1,12 @@ + + + + Microsoft + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Security.Cryptography.Pkcs.csproj b/src/libraries/shims/stubs/System.Security.Cryptography.Pkcs.csproj new file mode 100644 index 0000000000000..b9b52886deb00 --- /dev/null +++ b/src/libraries/shims/stubs/System.Security.Cryptography.Pkcs.csproj @@ -0,0 +1,42 @@ + + + + Microsoft + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/shims/stubs/System.Security.Cryptography.ProtectedData.csproj new file mode 100644 index 0000000000000..56952619b06df --- /dev/null +++ b/src/libraries/shims/stubs/System.Security.Cryptography.ProtectedData.csproj @@ -0,0 +1,12 @@ + + + + Microsoft + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Security.Cryptography.Xml.csproj b/src/libraries/shims/stubs/System.Security.Cryptography.Xml.csproj new file mode 100644 index 0000000000000..f9f8b33860489 --- /dev/null +++ b/src/libraries/shims/stubs/System.Security.Cryptography.Xml.csproj @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Security.Permissions.csproj b/src/libraries/shims/stubs/System.Security.Permissions.csproj new file mode 100644 index 0000000000000..4be0f81bfef3e --- /dev/null +++ b/src/libraries/shims/stubs/System.Security.Permissions.csproj @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.ServiceModel.Syndication.csproj b/src/libraries/shims/stubs/System.ServiceModel.Syndication.csproj new file mode 100644 index 0000000000000..f6ac0969c3b34 --- /dev/null +++ b/src/libraries/shims/stubs/System.ServiceModel.Syndication.csproj @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/shims/stubs/System.ServiceProcess.ServiceController.csproj b/src/libraries/shims/stubs/System.ServiceProcess.ServiceController.csproj new file mode 100644 index 0000000000000..2fee6933275e4 --- /dev/null +++ b/src/libraries/shims/stubs/System.ServiceProcess.ServiceController.csproj @@ -0,0 +1,20 @@ + + + + Microsoft + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Threading.AccessControl.csproj b/src/libraries/shims/stubs/System.Threading.AccessControl.csproj new file mode 100644 index 0000000000000..fd0e9e7bc9866 --- /dev/null +++ b/src/libraries/shims/stubs/System.Threading.AccessControl.csproj @@ -0,0 +1,22 @@ + + + + Microsoft + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/shims/stubs/System.Windows.Extensions.csproj b/src/libraries/shims/stubs/System.Windows.Extensions.csproj new file mode 100644 index 0000000000000..d77532c7f3bbd --- /dev/null +++ b/src/libraries/shims/stubs/System.Windows.Extensions.csproj @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file