Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ generated_code = true
# XML project files
[*.{slnx,csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,nativeproj,locproj}]
indent_size = 2
max_line_length = 160

# Xml build files
[*.builds]
Expand Down
5 changes: 1 addition & 4 deletions src/NetEvolve.Defaults/NetEvolve.Defaults.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
<None Include="_._" Pack="true" PackagePath="lib\$(TargetFramework)" Visible="false" />
</ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\NetEvolve.Defaults.Analyzer\NetEvolve.Defaults.Analyzer.csproj"
PrivateAssets="None"
/>
<ProjectReference Include="..\NetEvolve.Defaults.Analyzer\NetEvolve.Defaults.Analyzer.csproj" PrivateAssets="None" />
</ItemGroup>
<Import Project="build\NetEvolve.Defaults.targets" />
</Project>
7 changes: 1 addition & 6 deletions src/NetEvolve.Defaults/build/NetEvolve.Defaults.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)SupportGeneral.props" />
<Import Project="$(MSBuildThisFileDirectory)SupportDetectContinuousIntegration.props" />
<Import
Project="$(MSBuildThisFileDirectory)SupportPackageInformation.props"
Condition=" '$(DisableSupportPackageInformation)' != 'true' "
/>
<Import Project="$(MSBuildThisFileDirectory)\..\buildMultiTargeting\NetEvolve.Defaults.props" />
</Project>
22 changes: 1 addition & 21 deletions src/NetEvolve.Defaults/build/NetEvolve.Defaults.targets
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)SupportGeneral.targets" />
<Import
Project="$(MSBuildThisFileDirectory)SupportPackageInformation.targets"
Condition=" '$(DisableSupportPackageInformation)' != 'true' "
/>
<Import
Project="$(MSBuildThisFileDirectory)SupportCopyright.targets"
Condition=" '$(DisableSupportCopyrightTargets)' != 'true' "
/>
<Import
Project="$(MSBuildThisFileDirectory)SupportNuGetAudit.targets"
Condition=" '$(DisableSupportNuGetAuditTargets)' != 'true' "
/>
<Import
Project="$(MSBuildThisFileDirectory)SupportTestProjects.targets"
Condition=" '$(IsTestableProject)' == 'true' "
/>
<Import Project="$(MSBuildThisFileDirectory)SupportAdditionalFiles.targets" />
<Import Project="$(MSBuildThisFileDirectory)SupportSystemRuntimeExperimental.targets" />
<Import Project="$(MSBuildThisFileDirectory)SupportDetectContinuousIntegration.targets" />
<Import Project="$(MSBuildThisFileDirectory)SupportAssemblyAttributes.targets" />
<Import Project="$(MSBuildThisFileDirectory)\..\buildMultiTargeting\NetEvolve.Defaults.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)\..\build\NetEvolve.Defaults.props" />
<Import Project="$(MSBuildThisFileDirectory)SupportGeneral.props" />
<Import Project="$(MSBuildThisFileDirectory)SupportDetectContinuousIntegration.props" />
<Import
Project="$(MSBuildThisFileDirectory)SupportPackageInformation.props"
Condition=" '$(DisableSupportPackageInformation)' != 'true' "
/>
</Project>
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)\..\build\NetEvolve.Defaults.targets" />
<Import Project="$(MSBuildThisFileDirectory)SupportGeneral.targets" />
<Import
Project="$(MSBuildThisFileDirectory)SupportPackageInformation.targets"
Condition=" '$(DisableSupportPackageInformation)' != 'true' "
/>
<Import
Project="$(MSBuildThisFileDirectory)SupportCopyright.targets"
Condition=" '$(DisableSupportCopyrightTargets)' != 'true' "
/>
<Import
Project="$(MSBuildThisFileDirectory)SupportNuGetAudit.targets"
Condition=" '$(DisableSupportNuGetAuditTargets)' != 'true' "
/>
<Import
Project="$(MSBuildThisFileDirectory)SupportTestProjects.targets"
Condition=" '$(IsTestableProject)' == 'true' "
/>
<Import Project="$(MSBuildThisFileDirectory)SupportAdditionalFiles.targets" />
<Import Project="$(MSBuildThisFileDirectory)SupportSystemRuntimeExperimental.targets" />
<Import Project="$(MSBuildThisFileDirectory)SupportDetectContinuousIntegration.targets" />
<Import Project="$(MSBuildThisFileDirectory)SupportAssemblyAttributes.targets" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,4 @@
<NeutralLanguage>en</NeutralLanguage>
<PreferredUILang>en</PreferredUILang>
</PropertyGroup>
<PropertyGroup Condition=" '$(BuildingInsideVisualStudio)' == 'true' ">
<GeneratedFolder>_generated</GeneratedFolder>
<CompilerGeneratedFilesOutputPath>$(GeneratedFolder)/$(TargetFramework)</CompilerGeneratedFilesOutputPath>
</PropertyGroup>
<ItemGroup Condition=" '$(BuildingInsideVisualStudio)' == 'true' ">
<Compile Remove="$(GeneratedFolder)/**/*.cs" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)\..\build\NetEvolve.Defaults.props" />
<Import Project="$(MSBuildThisFileDirectory)\..\buildMultiTargeting\NetEvolve.Defaults.props" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)\..\build\NetEvolve.Defaults.targets" />
<Import Project="$(MSBuildThisFileDirectory)\..\buildMultiTargeting\NetEvolve.Defaults.targets" />
</Project>
1 change: 1 addition & 0 deletions src/NetEvolve.Defaults/configurations/editorconfig.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ generated_code = true
# XML project files
[*.{slnx,csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,nativeproj,locproj}]
indent_size = 2
max_line_length = 160

# Xml build files
[*.builds]
Expand Down