Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions Extensions.sln
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hostin
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.WindowsServices.Tests", "src\Hosting\WindowsServices\test\Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj", "{47D27C64-B8B7-4D10-9112-1432EACC79B3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.NewtonsoftJson", "src\Configuration\Config.NewtonsoftJson\src\Microsoft.Extensions.Configuration.NewtonsoftJson.csproj", "{1303074F-0B69-4BD9-944D-69F7F15D2933}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.NewtonsoftJson.Tests", "src\Configuration\Config.NewtonsoftJson\test\Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj", "{2FEE9416-E709-4EA7-82A3-4A34816F75FD}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Shared\src\CommandLineUtils\Microsoft.Extensions.CommandLineUtils.Sources.projitems*{de47cb52-3e6f-4a6a-910e-ae118a00ce1a}*SharedItemsImports = 5
Expand Down Expand Up @@ -186,30 +182,6 @@ Global
{47D27C64-B8B7-4D10-9112-1432EACC79B3}.Release|x64.Build.0 = Release|Any CPU
{47D27C64-B8B7-4D10-9112-1432EACC79B3}.Release|x86.ActiveCfg = Release|Any CPU
{47D27C64-B8B7-4D10-9112-1432EACC79B3}.Release|x86.Build.0 = Release|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Debug|x64.ActiveCfg = Debug|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Debug|x64.Build.0 = Debug|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Debug|x86.ActiveCfg = Debug|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Debug|x86.Build.0 = Debug|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Release|Any CPU.Build.0 = Release|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Release|x64.ActiveCfg = Release|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Release|x64.Build.0 = Release|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Release|x86.ActiveCfg = Release|Any CPU
{1303074F-0B69-4BD9-944D-69F7F15D2933}.Release|x86.Build.0 = Release|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Debug|x64.ActiveCfg = Debug|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Debug|x64.Build.0 = Debug|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Debug|x86.ActiveCfg = Debug|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Debug|x86.Build.0 = Debug|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Release|Any CPU.Build.0 = Release|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Release|x64.ActiveCfg = Release|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Release|x64.Build.0 = Release|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Release|x86.ActiveCfg = Release|Any CPU
{2FEE9416-E709-4EA7-82A3-4A34816F75FD}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -226,8 +198,6 @@ Global
{C85BC039-863D-4577-AECF-681A8ACA601A} = {6868A014-43FD-4047-B536-30D5D159D9D4}
{452F9F79-40E8-4B1C-8857-404062886080} = {6868A014-43FD-4047-B536-30D5D159D9D4}
{47D27C64-B8B7-4D10-9112-1432EACC79B3} = {6868A014-43FD-4047-B536-30D5D159D9D4}
{1303074F-0B69-4BD9-944D-69F7F15D2933} = {0ACE94D2-2AA1-4067-BAE1-5F9D2544FD3C}
{2FEE9416-E709-4EA7-82A3-4A34816F75FD} = {0ACE94D2-2AA1-4067-BAE1-5F9D2544FD3C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {814BFC88-0867-451F-AC8F-20FE107809B4}
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ The following list identifies all the packages we currently ship from [dotnet/ex
* **Hosting**
* [`Microsoft.Extensions.Hosting`](https://nuget.org/packages/Microsoft.Extensions.Hosting)
* [`Microsoft.Extensions.Hosting.Abstractions`](https://nuget.org/packages/Microsoft.Extensions.Hosting.Abstractions)
* [`Microsoft.Extensions.Hosting.Systemd`](https://nuget.org/packages/Microsoft.Extensions.Hosting.Systemd)
* [`Microsoft.Extensions.Hosting.WindowsServices`](https://nuget.org/packages/Microsoft.Extensions.Hosting.WindowsServices)
* **Http Client Factory**
* [`Microsoft.Extensions.Http`](https://nuget.org/packages/Microsoft.Extensions.Http)
* **Logging**
Expand Down Expand Up @@ -89,16 +91,13 @@ The following list identifies all the packages we currently ship from [dotnet/ex
* **Web Encoders**
* [`Microsoft.Extensions.WebEncoders`](https://nuget.org/packages/Microsoft.Extensions.WebEncoders)
* Remaining in [dotnet/extensions](https://github.com/dotnet/extensions) for now
* **Configuration**
* [`Microsoft.Extensions.Configuration.NewtonsoftJson`](https://nuget.org/packages/Microsoft.Extensions.Configuration.NewtonsoftJson)
* **Hosting**
* [`Microsoft.Extensions.Hosting.Systemd`](https://nuget.org/packages/Microsoft.Extensions.Hosting.Systemd)
* [`Microsoft.Extensions.Hosting.WindowsServices`](https://nuget.org/packages/Microsoft.Extensions.Hosting.WindowsServices)
* **Logging**
* `Microsoft.Extensions.Logging.Analyzers` (has not been released to NuGet.org as of writing)
* [`Microsoft.Extensions.DependencyInjection.Specification.Tests`](https://nuget.org/packages/Microsoft.Extensions.DependencyInjection.Specification.Tests)
* No longer shipping in 5.0
* [`Microsoft.Extensions.DiagnosticAdapter`](https://nuget.org/packages/Microsoft.Extensions.DiagnosticAdapter)
* [`Microsoft.Extensions.DependencyInjection.Specification.Tests`](https://nuget.org/packages/Microsoft.Extensions.DependencyInjection.Specification.Tests)
* No longer shipping in 6.0
* [`Microsoft.Extensions.Configuration.NewtonsoftJson`](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.NewtonsoftJson)

---

Expand Down
9 changes: 0 additions & 9 deletions eng/Baseline.Designer.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,6 @@
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[5.0.0, )" />
<BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.593, )" />
</ItemGroup>
<!-- Package: Microsoft.Extensions.Configuration.NewtonsoftJson-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Configuration.NewtonsoftJson' ">
<BaselinePackageVersion>5.0.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Configuration.NewtonsoftJson' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[5.0.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="[5.0.0, )" />
<BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
</ItemGroup>
<!-- Package: Microsoft.Extensions.Hosting.Systemd-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Hosting.Systemd' ">
<BaselinePackageVersion>5.0.0</BaselinePackageVersion>
Expand Down
1 change: 0 additions & 1 deletion eng/Baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ build of Extensions. Update this list when preparing for a new patch.
<Baseline Version="5.0.0">
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="5.0.0" />
<Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0" />
<Package Id="Microsoft.Extensions.Configuration.NewtonsoftJson" Version="5.0.0" />
<Package Id="Microsoft.Extensions.Hosting.Systemd" Version="5.0.0" />
<Package Id="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.0" />
<Package Id="Microsoft.Extensions.Http.Polly" Version="5.0.0" />
Expand Down
1 change: 0 additions & 1 deletion eng/ProjectReferences.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!-- This file is automatically generated. Run `./eng/scripts/GenerateProjectList.ps1` to update. -->
<Project>
<ItemGroup>
<ProjectReferenceProvider Include="Microsoft.Extensions.Configuration.NewtonsoftJson" ProjectPath="$(RepoRoot)src\Configuration\Config.NewtonsoftJson\src\Microsoft.Extensions.Configuration.NewtonsoftJson.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Hosting.Systemd" ProjectPath="$(RepoRoot)src\Hosting\Systemd\src\Microsoft.Extensions.Hosting.Systemd.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Hosting.WindowsServices" ProjectPath="$(RepoRoot)src\Hosting\WindowsServices\src\Microsoft.Extensions.Hosting.WindowsServices.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Logging.Analyzers" ProjectPath="$(RepoRoot)src\Logging\Logging.Analyzers\src\Microsoft.Extensions.Logging.Analyzers.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PatchVersion>0</PatchVersion>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this getting mvoed to 3 now (vs. when we branch?)

@Anipik Anipik Feb 22, 2021

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just combined the changes together, we wont be building or shipping anything from this.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it being retired going forward? Or will there be things for preview 3?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its being retired going forward. we dont want to ship anything in preview2 as well from extensions repo.

<AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
<ExperimentalVersionPrefix>0.1.$(PatchVersion)</ExperimentalVersionPrefix>
<!--
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading