Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Johluo/remove migrated files #3160

Merged
merged 5 commits into from
Apr 7, 2020
Merged

Johluo/remove migrated files #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
212d133
Remove migrated packages
Apr 7, 2020
af363c6
Remove reference assemblies and associated logic
Apr 7, 2020
10d2ec4
Cleanup slns and projects
Apr 7, 2020
3a99a49
Remove sample
Apr 7, 2020
ffc9824
Fix codecheck
Apr 7, 2020
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
2 changes: 0 additions & 2 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@
/src/Caching/ @tratcher @anurse
Copy link
Author

Choose a reason for hiding this comment

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

we should probably hand these off too @dotnet/extensions-migration .

Copy link

Choose a reason for hiding this comment

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

@JunTaoLuo are you able to provide details as to where the source for logging & logging abstractions now live? as the master branch no longer contains the source as far as I can tell?

Copy link
Member

Choose a reason for hiding this comment

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

https://github.com/dotnet/runtime/blob/6ef538d46fc971f351a22cbe854717f4ada59d89/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/ILogger.cs

Copy link

Choose a reason for hiding this comment

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

See aspnet/Announcements#411 for the full list of packages and where the code lives after this migration is complete.

Copy link

Choose a reason for hiding this comment

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

@Tratcher @anurse thanks for pointing me to the announcement and new location for the source; it may be good to also update the README.md accordingly with a more information and/or to redirect others to the new location for source; as people may still think the namespace/package relates to this repo and not the runtime repo if they have missed the announcement.

Copy link
Author

Choose a reason for hiding this comment

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

@bradygaster how far along are you with updating the readme?

Copy link

Choose a reason for hiding this comment

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

https://github.com/aspnet/Logging still points to https://github.com/dotnet/extensions which is quite confusing now

Copy link
Member

Choose a reason for hiding this comment

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

@poizan42 did you see the updated ReadMe in extensions?

Copy link

Choose a reason for hiding this comment

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

Yes, but the description at https://github.com/aspnet/Logging should probably still be updated to point to https://github.com/dotnet/runtime/tree/master/src/libraries/Microsoft.Extensions.Logging or something

/src/Configuration/ @tratcher @anurse
/src/Hosting/ @tratcher @anurse
/src/Primitives/ @tratcher @anurse
/src/Shared/src/HostFactoryResolver/ @tratcher @anurse
6 changes: 1 addition & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
<IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
<IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('samples'))">true</IsSampleProject>

<IsReferenceAssemblyProject>false</IsReferenceAssemblyProject>
Copy link
Author

Choose a reason for hiding this comment

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

@dotnet/aspnet-build I wanted to double check removing reference assembly related logic here. Since everything left is package only, I think we can remove all ref assemblies logic right?

Copy link
Member

Choose a reason for hiding this comment

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

Makes sense to me

<IsReferenceAssemblyProject Condition="$(MSBuildProjectDirectory.EndsWith('ref'))">true</IsReferenceAssemblyProject>
<OutDirName Condition="'$(IsReferenceAssemblyProject)' == 'true'">$(MSBuildProjectName)-ref</OutDirName>

<ExcludeFromSourceBuild Condition="'$(IsUnitTestProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsTestAssetProject)' == 'true' or '$(IsSampleProject)' == 'true'">true</ExcludeFromSourceBuild>
</PropertyGroup>
Expand Down Expand Up @@ -54,7 +51,7 @@
<ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' ">
<ProjectReference Include="$(MSBuildThisFileDirectory)src\TestingUtils\Microsoft.AspNetCore.Testing\src\Microsoft.AspNetCore.Testing.csproj" />
<Reference Include="Moq" />
<!-- Bring in the latest NETStandard.Library to avoid too many package references from
<!-- Bring in the latest NETStandard.Library to avoid too many package references from
Moq & xunit's dependencies -->
<Reference Include="NETStandard.Library" />
</ItemGroup>
Expand All @@ -73,5 +70,4 @@

<Import Project="eng\Dependencies.props" />
<Import Project="eng\ProjectReferences.props" />
<Import Project="eng\targets\Csharp.Refs.props" Condition="'$(IsReferenceAssemblyProject)' == 'true'" />
Copy link
Member

Choose a reason for hiding this comment

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

Hey @JunTaoLuo why is eng/targets/Csharp.Refs.props still in this repo?

Copy link
Author

Choose a reason for hiding this comment

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

No reason, i just forgot to remove it.

</Project>
10 changes: 1 addition & 9 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@

<PropertyGroup>
<!-- Implementation projects are the projects which produce nuget packages or shipping assemblies. -->
<IsImplementationProject Condition=" '$(IsImplementationProject)' == '' AND '$(IsTestAssetProject)' != 'true' AND '$(IsUnitTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsSampleProject)' != 'true' AND '$(IsReferenceAssemblyProject)' == 'false' ">true</IsImplementationProject>
<IsImplementationProject Condition=" '$(IsImplementationProject)' == '' AND '$(IsTestAssetProject)' != 'true' AND '$(IsUnitTestProject)' != 'true' AND '$(IsBenchmarkProject)' != 'true' AND '$(IsSampleProject)' != 'true' ">true</IsImplementationProject>
<!-- This determines whether a project is available as a <Reference> to other projects in this repo. -->
<IsProjectReferenceProvider Condition=" '$(IsProjectReferenceProvider)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(PackAsTool)' != 'true' ">true</IsProjectReferenceProvider>

<HasReferenceAssembly Condition="'$(HasReferenceAssembly)' == '' AND '$(IsProjectReferenceProvider)' == 'true' AND '$(IsShipping)' == 'true'">true</HasReferenceAssembly>
<HasReferenceAssembly Condition="'$(HasReferenceAssembly)' == ''">false</HasReferenceAssembly>
</PropertyGroup>

<ItemGroup>
Expand All @@ -45,13 +42,8 @@
IsImplicitlyDefined="true" />
</ItemGroup>

<ItemGroup Condition="'$(Language)' == 'C#' AND '$(IsReferenceAssemblyProject)' == 'true'">
<Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
</ItemGroup>

<Import Project="eng\targets\Packaging.targets" Condition=" '$(MSBuildProjectExtension)' == '.csproj' " />
<Import Project="eng\targets\ResolveReferences.targets" Condition=" '$(DisableReferenceRestrictions)' != 'true' AND '$(MSBuildProjectExtension)' == '.csproj' " />
<Import Project="eng\targets\ReferenceAssembly.targets" Condition=" '$(HasReferenceAssembly)' == 'true' " />
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="eng\Workarounds.AfterArcade.targets" />
</Project>
377 changes: 0 additions & 377 deletions Extensions.sln
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<Project>
<ItemGroup>
<ProjectToBuild Include="$(RepoRoot)src\**\*.csproj" Condition="'$(BuildCSharp)' != 'false'"/>
<ProjectToBuild Include="$(RepoRoot)src\**\*.npmproj" Condition="'$(BuildNodeJS)' == 'true'">
<RestoreInParallel>false</RestoreInParallel>
</ProjectToBuild>
</ItemGroup>
</Project>
18 changes: 8 additions & 10 deletions eng/ProjectReferences.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
<!-- This file is automatically generated. Run `./eng/scripts/GenerateProjectList.ps1` to update. -->
<Project>
<ItemGroup>
<ProjectReferenceProvider Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" ProjectPath="$(RepoRoot)src\DependencyInjection\DI.Specification.Tests\src\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.SqlServer" ProjectPath="$(RepoRoot)src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.StackExchangeRedis" ProjectPath="$(RepoRoot)src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Configuration.NewtonsoftJson" ProjectPath="$(RepoRoot)src\Configuration\Config.NewtonsoftJson\src\Microsoft.Extensions.Configuration.NewtonsoftJson.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.DiagnosticAdapter" ProjectPath="$(RepoRoot)src\DiagnosticAdapter\src\Microsoft.Extensions.DiagnosticAdapter.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.Http.Polly" ProjectPath="$(RepoRoot)src\HttpClientFactory\Polly\src\Microsoft.Extensions.Http.Polly.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Logging.Analyzers" ProjectPath="$(RepoRoot)src\Logging\Logging.Analyzers\src\Microsoft.Extensions.Logging.Analyzers.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Logging.Testing" ProjectPath="$(RepoRoot)src\Logging\Logging.Testing\src\Microsoft.Extensions.Logging.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Analyzer.Testing" ProjectPath="$(RepoRoot)src\TestingUtils\Microsoft.AspNetCore.Analyzer.Testing\src\Microsoft.AspNetCore.Analyzer.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.SqlServer" ProjectPath="$(RepoRoot)src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj" RefProjectPath="$(RepoRoot)src\Caching\SqlServer\ref\Microsoft.Extensions.Caching.SqlServer.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.StackExchangeRedis" ProjectPath="$(RepoRoot)src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj" RefProjectPath="$(RepoRoot)src\Caching\StackExchangeRedis\ref\Microsoft.Extensions.Caching.StackExchangeRedis.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Configuration.NewtonsoftJson" ProjectPath="$(RepoRoot)src\Configuration\Config.NewtonsoftJson\src\Microsoft.Extensions.Configuration.NewtonsoftJson.csproj" RefProjectPath="$(RepoRoot)src\Configuration\Config.NewtonsoftJson\ref\Microsoft.Extensions.Configuration.NewtonsoftJson.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.DiagnosticAdapter" ProjectPath="$(RepoRoot)src\DiagnosticAdapter\src\Microsoft.Extensions.DiagnosticAdapter.csproj" RefProjectPath="$(RepoRoot)src\DiagnosticAdapter\ref\Microsoft.Extensions.DiagnosticAdapter.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Hosting.Systemd" ProjectPath="$(RepoRoot)src\Hosting\Systemd\src\Microsoft.Extensions.Hosting.Systemd.csproj" RefProjectPath="$(RepoRoot)src\Hosting\Systemd\ref\Microsoft.Extensions.Hosting.Systemd.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Hosting.WindowsServices" ProjectPath="$(RepoRoot)src\Hosting\WindowsServices\src\Microsoft.Extensions.Hosting.WindowsServices.csproj" RefProjectPath="$(RepoRoot)src\Hosting\WindowsServices\ref\Microsoft.Extensions.Hosting.WindowsServices.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Http.Polly" ProjectPath="$(RepoRoot)src\HttpClientFactory\Polly\src\Microsoft.Extensions.Http.Polly.csproj" RefProjectPath="$(RepoRoot)src\HttpClientFactory\Polly\ref\Microsoft.Extensions.Http.Polly.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Logging.AzureAppServices" ProjectPath="$(RepoRoot)src\Logging\Logging.AzureAppServices\src\Microsoft.Extensions.Logging.AzureAppServices.csproj" RefProjectPath="$(RepoRoot)src\Logging\Logging.AzureAppServices\ref\Microsoft.Extensions.Logging.AzureAppServices.csproj" />

</ItemGroup>
</Project>
8 changes: 1 addition & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>4</PreReleaseVersionIteration>
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' != 'true'">$(VersionPrefix).0</AssemblyVersion>
<!--
We do not support changing reference assemblies in a patch. This ignores
the patch version number to ensure assembly version of ref assemblies stays constant
throughout major.minor.
-->
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' == 'true'">$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
<AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
<ExperimentalVersionPrefix>0.1.$(PatchVersion)</ExperimentalVersionPrefix>
<!--
Until package baselines are updated (see dotnet/aspnetcore#12702), ignore them and PatchConfig.props. This also
Expand Down
19 changes: 0 additions & 19 deletions eng/repo.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,4 @@
Command="echo '$(ProjectListContent.Replace('\t','\\t'))' > $(ProjectListFile)" />
</Target>

<Target Name="GenerateReferenceSources">
<MSBuild
Projects="@(ProjectToBuild)"
Targets="GenerateReferenceSource"
SkipNonexistentTargets="true"
SkipNonexistentProjects="true" />
</Target>

<Target Name="EnsureFunctionalTestLogsPreserved">
<PropertyGroup>
<FunctionalLogDir>$(ArtifactsDir)log\Microsoft.Extensions.Logging.Testing.Tests\$(DefaultNetCoreTargetFramework)\AssemblyTestLogTests\</FunctionalLogDir>
<FlakyTestLog>$(FunctionalLogDir)FunctionalLogs_LogsPreservedFromFlakyRun.log</FlakyTestLog>
<NonFlakyTestLog>$(FunctionalLogDir)FunctionalLogs_LogsPreservedFromNonFlakyRun.log</NonFlakyTestLog>
</PropertyGroup>
<Error Condition="!Exists('$(FlakyTestLog)')" Text="Flaky test functional logs not found." />
<Error Condition="!Exists('$(FlakyTestLog)')" Text="Non flaky test functional logs not found." />

<Message Text="All functional test logs preserved" Importance="High" />
</Target>
</Project>
7 changes: 1 addition & 6 deletions eng/scripts/CodeCheck.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ try {
& $PSScriptRoot\GenerateProjectList.ps1
}

Write-Host "Re-generating references assemblies"
Invoke-Block {
& $PSScriptRoot\GenerateReferenceAssemblies.ps1
}

Write-Host "Re-generating package baselines"
$dotnet = 'dotnet'
if ($ci) {
Expand All @@ -108,7 +103,7 @@ try {
foreach ($file in $changedFiles) {
if ($file -eq $changedFilesExclusion) {continue}
$filePath = Resolve-Path "${repoRoot}/${file}"
LogError "Generated code is not up to date in $file. You might need to regenerate the reference assemblies or project list (see docs/ReferenceAssemblies.md and docs/ReferenceResolution.md)" -filepath $filePath
LogError "Generated code is not up to date in $file. You might need to regenerate the project list (see docs/ReferenceResolution.md)" -filepath $filePath
& git --no-pager diff --ignore-space-change $filePath
}
}
Expand Down
9 changes: 0 additions & 9 deletions eng/scripts/GenerateReferenceAssemblies.ps1
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions eng/targets/ReferenceAssembly.targets
View file
Open in desktop

This file was deleted.

Loading