Will Godbe 050e7e257f Resolve merge conflicts		2021-02-16 09:50:53 -08:00
..
common	Update dependencies from https://github.com/dotnet/arcade build 20210212.3 (#30155)	2021-02-12 21:52:48 +00:00
docker	…
helix	…
scripts	…
targets	Fix .msi names (#28572)	2020-12-10 12:01:51 -08:00
tools	[release/5.0] Update dependencies from dotnet/efcore dotnet/runtime (#28087)	2020-11-30 03:46:55 +00:00
AfterSigning.targets	…
AfterSolutionBuild.targets	…
AllRulesDisabled.ruleset	…
Baseline.Designer.props	Update package baselines	2021-02-09 15:06:28 -08:00
Baseline.xml	Update package baselines	2021-02-09 15:06:28 -08:00
Build.props	…
CodeGen.proj	…
Common.props	…
Dependencies.props	[release/5.0] Update dependencies from dotnet/efcore dotnet/runtime (#28087)	2020-11-30 03:46:55 +00:00
GenAPI.exclusions.txt	…
LicenseHeader.txt	…
PackageOverrides.txt	…
PlatformManifest.txt	…
PoliCheckExclusions.xml	…
ProjectReferences.props	Stop building dotnet-watch in AspNetCore (#29722)	2021-02-09 18:43:18 -08:00
PublicAPI.empty.txt	…
PublishSymbols.proj	…
Publishing.props	Merge pull request #30004 from adiaaida/renameProductVersion (#30124)	2021-02-11 16:25:47 -08:00
QuarantinedTests.AfterArcade.props	…
QuarantinedTests.BeforeArcade.props	…
SharedFramework.External.props	…
SharedFramework.Local.props	…
SignCheckExclusionsFile.txt	…
Signing.props	…
Tools.props	…
Version.Details.xml	Resolve merge conflicts	2021-02-16 09:50:53 -08:00
Versions.props	Resolve merge conflicts	2021-02-16 09:50:53 -08:00
Workarounds.props	…
Workarounds.targets	…
WorkaroundsImported.targets	…
configure-toolset.ps1	…
configure-toolset.sh	…
empty.proj	…
sdl-tsa-vars.config	…