Skip to content

Commit f12d709

Browse files
authored
Use even more Arcade and other csproj cleanups (#1833)
* Use Arcade's convention for setting IsPackable (must be explicitly set) * Use Arcade conventions for using DebugType and eng/Versions.props * Remove dead code * Update restore feeds in daily builds.md * Disable UsingToolNetFrameworkReferenceAssemblies in analyzer tests * Remove usage of TestGroupName (an obsolete KoreBuild setting) * Use IVT as a .csproj attribute
1 parent 42b3a30 commit f12d709

File tree

72 files changed

+95
-135
lines changed

Some content is hidden

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

72 files changed

+95
-135
lines changed

Directory.Build.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
</PropertyGroup>
2121

2222
<Import Project="eng\FlakyTests.BeforeArcade.props" />
23-
<Import Project="eng\Workarounds.BeforeArcade.props" />
2423
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
25-
<Import Project="eng\Workarounds.AfterArcade.props" />
2624
<Import Project="eng\FlakyTests.AfterArcade.props" />
2725

2826
<PropertyGroup>
@@ -76,6 +74,5 @@
7674
<Import Project="eng\PatchConfig.props" />
7775
<Import Project="eng\ProjectReferences.props" />
7876
<Import Project="eng\targets\Csharp.Refs.props" Condition="'$(IsReferenceAssemblyProject)' == 'true'" />
79-
8077
<Import Project="eng\targets\Npm.Common.props" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
8178
</Project>

Directory.Build.targets

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.csproj' ">
44
<PackageId Condition=" '$(PackageId)' == '' ">$(AssemblyName)</PackageId>
55
<Description Condition=" '$(Description)' == ''">$(PackageId)</Description>
6-
<IsPackable Condition="'$(IsPackable)' == '' AND ( '$(IsUnitTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' OR '$(IsReferenceAssemblyProject)' == 'true' ) ">false</IsPackable>
7-
<IsPackable Condition="'$(IsPackable)' == '' ">true</IsPackable>
86
</PropertyGroup>
97

108
<Import Project="eng\Baseline.Designer.props" />
@@ -44,6 +42,5 @@
4442
<Import Project="eng\targets\ReferenceAssembly.targets" Condition=" '$(HasReferenceAssembly)' == 'true' " />
4543
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4644
<Import Project="eng\Workarounds.AfterArcade.targets" />
47-
4845
<Import Project="eng\targets\Npm.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
4946
</Project>

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
- script: eng\scripts\ci-flaky-tests.cmd -configuration $(_BuildConfig)
109109
displayName: Run Flaky Tests
110110
continueOnError: true
111-
- powershell: eng\common\msbuild.ps1 eng/repo.targets /t:TagCiBuilds '/p:IsFinalBuild=$(IsFinalBuild)' '/p:CI=true'
111+
- powershell: eng\common\msbuild.ps1 eng/repo.targets /t:TagCiBuilds '/p:DotNetFinalVersionKind=$(DotNetFinalVersionKind)' '/p:CI=true'
112112
displayName: Set CI Tags
113113
condition: eq(variables['_BuildConfig'], 'Release')
114114
- powershell: eng\scripts\KillProcesses.ps1

docs/DailyBuilds.md

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ If you want to download the latest daily build and use it in a project, then you
1313
<configuration>
1414
<packageSources>
1515
<clear />
16-
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
16+
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
17+
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
1718
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
1819
</packageSources>
1920
</configuration>
@@ -23,21 +24,3 @@ If you want to download the latest daily build and use it in a project, then you
2324

2425
Some features, such as new target frameworks, may require prerelease tooling builds for Visual Studio.
2526
These are available in the [Visual Studio Preview](https://www.visualstudio.com/vs/preview/).
26-
27-
## NuGet packages
28-
29-
Daily builds of ackages can be found on <https://dotnet.myget.org/gallery/dotnet-core>. This feed may include
30-
packages that will not be supported in a officially released build.
31-
32-
Commonly referenced packages:
33-
34-
[logging-myget]: https://dotnet.myget.org/feed/dotnet-core/package/nuget/Microsoft.Extensions.Logging
35-
[logging-myget-badge]: https://img.shields.io/dotnet.myget/dotnet-core/vpre/Microsoft.Extensions.Logging.svg?style=flat-square&label=myget
36-
37-
[di-myget]: https://dotnet.myget.org/feed/dotnet-core/package/nuget/Microsoft.Extensions.DependencyInjection
38-
[di-myget-badge]: https://img.shields.io/dotnet.myget/dotnet-core/vpre/Microsoft.Extensions.DependencyInjection.svg?style=flat-square&label=myget
39-
40-
Package | MyGet
41-
:------------------------------------------|:---------------------------------------------------------
42-
Microsoft.Extensions.Logging | [![][logging-myget-badge]][logging-myget]
43-
Microsoft.Extensions.DependencyInjection | [![][di-myget-badge]][di-myget]

docs/PreparingPatchUpdates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Preparing new servicing updates
33

44
In order to prepare this repo to build a new servicing update, the following changes need to be made.
55

6-
* Increment the patch version in the [version.props](/version.props) file in the repository root.
6+
* Increment the patch version in the [eng/Versions.props](/eng/Versions.props) file in the repository root.
77

88
```diff
99
- <PatchVersion>7</PatchVersion>

eng/NuGetPackageVerifier.json

Lines changed: 0 additions & 31 deletions
This file was deleted.

eng/Versions.props

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,32 @@
55
66
-->
77
<Project>
8-
<Import Project="..\version.props" />
8+
<PropertyGroup Label="Version settings">
9+
<MajorVersion>3</MajorVersion>
10+
<MinorVersion>0</MinorVersion>
11+
<PatchVersion>0</PatchVersion>
12+
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
13+
<PreReleaseVersionLabel>preview7</PreReleaseVersionLabel>
14+
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' != 'true'">$(VersionPrefix).0</AssemblyVersion>
15+
<!--
16+
We do not support changing reference assemblies in a patch. This ignores
17+
the patch version number to ensure assembly version of ref assemblies stays constant
18+
throughout major.minor.
19+
-->
20+
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' == 'true'">$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
21+
<ExperimentalVersionPrefix>0.1.$(PatchVersion)</ExperimentalVersionPrefix>
22+
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
23+
<IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
24+
<!-- This is used for error checking to ensure generated code and baselines are up to date when we increment the patch. -->
25+
<PreviousExtensionsReleaseVersion Condition=" '$(PatchVersion)' != '0' ">$(MajorVersion).$(MinorVersion).$([MSBuild]::Subtract($(PatchVersion), 1))</PreviousExtensionsReleaseVersion>
26+
</PropertyGroup>
927
<PropertyGroup Label="Arcade settings">
1028
<!-- Opt-in to using the version of the Roslyn compiler bundled with Arcade. -->
1129
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
30+
<!-- Disable Arcade's Xliff tools -->
31+
<UsingToolXliff>false</UsingToolXliff>
32+
<!-- Using .NET framework assemblies from a package. -->
33+
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
1234
</PropertyGroup>
1335
<!--
1436

eng/Workarounds.AfterArcade.props

Lines changed: 0 additions & 9 deletions
This file was deleted.

eng/Workarounds.BeforeArcade.props

Lines changed: 0 additions & 9 deletions
This file was deleted.

eng/repo.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Import Project="Build.props" />
44

55
<Target Name="TagCiBuilds" Condition=" '$(CI)' == 'true' AND '$(BUILD_REASON)' != 'PullRequest' ">
6-
<Message Importance="high" Text="##vso[build.addbuildtag]daily-build" Condition=" '$(IsFinalBuild)' != 'true' " />
7-
<Message Importance="high" Text="##vso[build.addbuildtag]release-candidate" Condition=" '$(IsFinalBuild)' == 'true' " />
6+
<Message Importance="high" Text="##vso[build.addbuildtag]daily-build" Condition=" '$(DotNetFinalVersionKind)' == '' " />
7+
<Message Importance="high" Text="##vso[build.addbuildtag]release-candidate" Condition=" '$(DotNetFinalVersionKind)' != '' " />
88
</Target>
99

1010
<Target Name="GenerateProjectList">

0 commit comments

Comments
 (0)