Skip to content

Clean-up sourcelink repo and remove workarounds (grouped into commits) #1015

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

Merged
merged 15 commits into from
May 3, 2023
Merged

Clean-up sourcelink repo and remove workarounds (grouped into commits) #1015

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f1943dd
Remove non-needed sourcebuild target
ViktorHofer Apr 27, 2023
f1dfc6d
Enable FlagNetStandard1XDependencies arcade switch
ViktorHofer Apr 27, 2023
abd9304
Remove unnecessary MicrosoftNETTestSdkVersion entry
ViktorHofer Apr 27, 2023
467c9ec
Remove unused NuGetPackagingVersion property in Versions.props
ViktorHofer Apr 27, 2023
ff3907c
Group dependencies in Versions.props by source repo
ViktorHofer Apr 27, 2023
96c9444
Replace runtimeconfig.template.json with Rollfroward
ViktorHofer Apr 27, 2023
ef6a08c
Define target frameworks for source build centrally in one place.
ViktorHofer Apr 27, 2023
96c6dc7
Use NoTargets msbuild SDK for StandardCI.csproj
ViktorHofer Apr 27, 2023
5183fb3
Remove non-needed PrivateAssets attribute
ViktorHofer Apr 27, 2023
b36ac30
Add 'Version' suffix to MicrosoftBuildTasksCoreVersion property
ViktorHofer Apr 27, 2023
673a8e0
Remove non-needed ExcludeFromSourceBuild switch
ViktorHofer Apr 27, 2023
be7ddc1
Remove non-needed TestUtilities dependencies
ViktorHofer Apr 27, 2023
e67af45
Add link to tracking issue for TFM filtering
ViktorHofer May 2, 2023
ce00f28
Merge branch 'main' into SourceBuildCleanupInCommits
ViktorHofer May 3, 2023
62c2e8a
Revert XUnit.Combinatorial change
ViktorHofer May 3, 2023
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
5 changes: 5 additions & 0 deletions src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<!-- TODO: Remove when Arcade offers an in-built way to filter out anything other than NetCurrent. -->
<PropertyGroup>
<TargetFrameworks Condition="'$(TargetFrameworks)' != '' and '$(DotNetBuildFromSource)' == 'true'">$(NetCurrent)</TargetFrameworks>
</PropertyGroup>

<ItemGroup Condition="'$(IsTestProject)' == 'true'">
<!-- Upgrade the NETStandard.Library transitive xunit dependency to avoid transitive 1.x NS dependencies. -->
<PackageReference Include="NETStandard.Library" Version="2.0.3" Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard'" />
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- NuGet: Using an explicit nuspec file to customize TFM directory -->
Expand Down
1 change: 0 additions & 1 deletion src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
Expand Down
1 change: 0 additions & 1 deletion src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
Expand Down
1 change: 0 additions & 1 deletion src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- Using an explicit nuspec file since NuGet Pack target currently doesn't support including dependencies in tools packages -->
Expand Down
1 change: 0 additions & 1 deletion src/SourceLink.Common/Microsoft.SourceLink.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- NuGet: Using an explicit nuspec file to customize TFM directory -->
Expand Down
1 change: 0 additions & 1 deletion src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
Expand Down
1 change: 0 additions & 1 deletion src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
Expand Down
1 change: 0 additions & 1 deletion src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
Expand Down
1 change: 0 additions & 1 deletion src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
Expand Down
1 change: 0 additions & 1 deletion src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
Expand Down