Skip to content

Commit 10780cd

Browse files
committed
Build using Arcade
Notes for Muggles: - `build` only compiles by default. Add `-test` to run tests and `-pack` to get nupkgs - Dependency versions are now in `eng/Versions.props` - No more API Check, *.baselines.json, or *.breakingchanges.json - No more NuGet package verifier - Nightly builds are now published to https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json Fixes #12537, resolves #14025, resolves dotnet/arcade#1051, resolves dotnet/arcade#1052, resolves dotnet/arcade#1053, resolves dotnet/arcade#1054
1 parent 2f07f47 commit 10780cd

File tree

126 files changed

+4628
-102170
lines changed

Some content is hidden

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

126 files changed

+4628
-102170
lines changed

Diff for: .gitignore

+64-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/.build/
2-
/global.json
31
QueryBaseline.cs
42

53
## Ignore Visual Studio temporary files, build results, and
@@ -8,13 +6,11 @@ QueryBaseline.cs
86
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
97

108
# User-specific files
9+
*.rsuser
1110
*.suo
1211
*.user
1312
*.userosscache
1413
*.sln.docstates
15-
*.user.sln*
16-
/test.ps1
17-
*.stackdump
1814

1915
# User-specific files (MonoDevelop/Xamarin Studio)
2016
*.userprefs
@@ -26,18 +22,20 @@ QueryBaseline.cs
2622
[Rr]eleases/
2723
x64/
2824
x86/
25+
[Aa][Rr][Mm]/
26+
[Aa][Rr][Mm]64/
2927
bld/
3028
[Bb]in/
3129
[Oo]bj/
3230
[Ll]og/
3331

34-
# Visual Studio 2015 cache/options directory
32+
# Visual Studio 2015/2017 cache/options directory
3533
.vs/
3634
# Uncomment if you have tasks that create the project's static files in wwwroot
3735
#wwwroot/
3836

39-
# BenchmarkDotNet Results
40-
[Bb]enchmarkDotNet.Artifacts/
37+
# Visual Studio 2017 auto generated files
38+
Generated\ Files/
4139

4240
# MSTest test Results
4341
[Tt]est[Rr]esult*/
@@ -52,20 +50,29 @@ TestResult.xml
5250
[Rr]eleasePS/
5351
dlldata.c
5452

53+
# Benchmark Results
54+
BenchmarkDotNet.Artifacts/
55+
5556
# .NET Core
5657
project.lock.json
5758
project.fragment.lock.json
5859
artifacts/
59-
**/Properties/launchSettings.json
60+
.dotnet/
61+
62+
# StyleCop
63+
StyleCopReport.xml
6064

65+
# Files built by Visual Studio
6166
*_i.c
6267
*_p.c
63-
*_i.h
68+
*_h.h
6469
*.ilk
6570
*.meta
6671
*.obj
72+
*.iobj
6773
*.pch
6874
*.pdb
75+
*.ipdb
6976
*.pgc
7077
*.pgd
7178
*.rsp
@@ -75,6 +82,7 @@ artifacts/
7582
*.tlh
7683
*.tmp
7784
*.tmp_proj
85+
*_wpftmp.csproj
7886
*.log
7987
*.vspscc
8088
*.vssscc
@@ -103,6 +111,9 @@ ipch/
103111
*.vspx
104112
*.sap
105113

114+
# Visual Studio Trace Files
115+
*.e2e
116+
106117
# TFS 2012 Local Workspace
107118
$tf/
108119

@@ -123,6 +134,10 @@ _TeamCity*
123134
# DotCover is a Code Coverage Tool
124135
*.dotCover
125136

137+
# AxoCover is a Code Coverage Tool
138+
.axoCover/*
139+
!.axoCover/settings.json
140+
126141
# Visual Studio code coverage results
127142
*.coverage
128143
*.coveragexml
@@ -158,7 +173,7 @@ publish/
158173
# Publish Web Output
159174
*.[Pp]ublish.xml
160175
*.azurePubxml
161-
# TODO: Comment the next line if you want to checkin your web deploy settings
176+
# Note: Comment the next line if you want to checkin your web deploy settings,
162177
# but database connection strings (with potential passwords) will be unencrypted
163178
*.pubxml
164179
*.publishproj
@@ -170,12 +185,13 @@ PublishScripts/
170185

171186
# NuGet Packages
172187
*.nupkg
188+
.packages/
173189
# The packages folder can be ignored because of Package Restore
174-
**/packages/*
190+
**/[Pp]ackages/*
175191
# except build/, which is used as an MSBuild target.
176-
!**/packages/build/
192+
!**/[Pp]ackages/build/
177193
# Uncomment if necessary however generally it will be regenerated when needed
178-
#!**/packages/repositories.config
194+
#!**/[Pp]ackages/repositories.config
179195
# NuGet v3's project.json files produces more ignorable files
180196
*.nuget.props
181197
*.nuget.targets
@@ -193,6 +209,7 @@ AppPackages/
193209
BundleArtifacts/
194210
Package.StoreAssociation.xml
195211
_pkginfo.txt
212+
*.appx
196213

197214
# Visual Studio cache files
198215
# files ending in .cache can be ignored
@@ -211,9 +228,15 @@ ClientBin/
211228
*.publishsettings
212229
orleans.codegen.cs
213230

231+
# Including strong name files can present a security risk
232+
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
233+
#*.snk
234+
214235
# Since there are multiple workflows, uncomment next line to ignore bower_components
215236
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
216237
#bower_components/
238+
# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
239+
**/wwwroot/lib/
217240

218241
# RIA/Silverlight projects
219242
Generated_Code/
@@ -225,15 +248,19 @@ _UpgradeReport_Files/
225248
Backup*/
226249
UpgradeLog*.XML
227250
UpgradeLog*.htm
251+
ServiceFabricBackup/
252+
*.rptproj.bak
228253

229254
# SQL Server files
230255
*.mdf
231256
*.ldf
257+
*.ndf
232258

233259
# Business Intelligence projects
234260
*.rdl.data
235261
*.bim.layout
236262
*.bim_*.settings
263+
*.rptproj.rsuser
237264

238265
# Microsoft Fakes
239266
FakesAssemblies/
@@ -245,9 +272,6 @@ FakesAssemblies/
245272
.ntvs_analysis.dat
246273
node_modules/
247274

248-
# Typescript v1 declaration files
249-
typings/
250-
251275
# Visual Studio 6 build log
252276
*.plg
253277

@@ -276,8 +300,8 @@ paket-files/
276300
.idea/
277301
*.sln.iml
278302

279-
# CodeRush
280-
.cr/
303+
# CodeRush personal settings
304+
.cr/personal
281305

282306
# Python Tools for Visual Studio (PTVS)
283307
__pycache__/
@@ -287,6 +311,9 @@ __pycache__/
287311
# tools/**
288312
# !tools/packages.config
289313

314+
# Tabs Studio
315+
*.tss
316+
290317
# Telerik's JustMock configuration file
291318
*.jmconfig
292319

@@ -295,3 +322,21 @@ __pycache__/
295322
*.btm.cs
296323
*.odx.cs
297324
*.xsd.cs
325+
326+
# OpenCover UI analysis results
327+
OpenCover/
328+
329+
# Azure Stream Analytics local run output
330+
ASALocalRun/
331+
332+
# MSBuild Binary and Structured Log
333+
*.binlog
334+
335+
# NVidia Nsight GPU debugger configuration file
336+
*.nvuser
337+
338+
# MFractors (Xamarin productivity tool) working folder
339+
.mfractor/
340+
341+
# Local History for Visual Studio
342+
.localhistory/

Diff for: Directory.Build.props

+18-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
1-
<Project>
1+
<Project>
2+
<!-- HACK: Our test projects don't match Arcade's conventions -->
3+
<PropertyGroup Condition="'$(IsUnitTestProject)' == ''">
4+
<IsUnitTestProject Condition="$(MSBuildProjectName.EndsWith('.FunctionalTests'))">True</IsUnitTestProject>
5+
</PropertyGroup>
6+
7+
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
8+
29
<Import
310
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
411
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
512

6-
<Import Project="version.props" />
7-
<Import Project="build\dependencies.props" />
8-
<Import Project="build\sources.props" />
9-
1013
<PropertyGroup>
11-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
14+
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
1215
<PackageTags>Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore</PackageTags>
1316
<Product>Microsoft Entity Framework Core</Product>
14-
<RepositoryType>git</RepositoryType>
15-
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
16-
<RepositoryUrl>https://github.com/aspnet/EntityFrameworkCore</RepositoryUrl>
17-
<SignAssembly>True</SignAssembly>
1817
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1918
<LangVersion>7.2</LangVersion>
20-
<NoWarn>$(NoWarn);CS1591;CA1032;CA1034;CA1052;CA1063;CA1815;CA1819;CA1822;CA2231</NoWarn>
19+
<DebugType>portable</DebugType>
20+
<PackageLicenseUrl>https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt</PackageLicenseUrl>
21+
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
22+
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
23+
</PropertyGroup>
24+
25+
<!-- HACK: Work around dotnet/arcade#1373 -->
26+
<PropertyGroup>
27+
<NoWarn>$(NoWarn);NU5125</NoWarn>
2128
</PropertyGroup>
2229

2330
<ItemGroup>

Diff for: Directory.Build.targets

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
<Project>
2-
<PropertyGroup Condition=" '$(TargetLatestDotNetRuntime)' != 'false' ">
3-
<!-- Assign these values at the end of the project after TargetFramework has been assigned. TargetFramework is not assigned yet in Directory.Build.props. -->
4-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
5-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
6-
</PropertyGroup>
1+
<Project>
2+
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
73

84
<!-- This is required to workaround overlap between System.Collections.Generic.IAsyncEnumerable in System.Runtime and System.Interactive.Async. -->
95
<Target Name="AddAssemblyAliasToReactiveAsync"

Diff for: EFCore.Cosmos.sln.DotSettings

-5
This file was deleted.

Diff for: EFCore.Runtime.sln.DotSettings

-5
This file was deleted.

0 commit comments

Comments
 (0)