Skip to content

Commit 0ea8238

Browse files
committed
Updated ProductTemplate.
1 parent 9edd441 commit 0ea8238

File tree

9 files changed

+25
-19
lines changed

9 files changed

+25
-19
lines changed

.teamcity/settings.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object DebugBuild : BuildType({
2424

2525
name = "Build [Debug]"
2626

27-
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private"
27+
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private\n+:artifacts/testResults/**/*=>artifacts/testResults\n+:artifacts/logs/**/*=>logs\n+:%system.teamcity.build.tempDir%/Metalama/AssemblyLocator/**/*=>logs\n+:%system.teamcity.build.tempDir%/Metalama/CompileTime/**/.completed=>logs\n+:%system.teamcity.build.tempDir%/Metalama/CompileTimeTroubleshooting/**/*=>logs\n+:%system.teamcity.build.tempDir%/Metalama/CrashReports/**/*=>logs\n+:%system.teamcity.build.tempDir%/Metalama/Extract/**/.completed=>logs\n+:%system.teamcity.build.tempDir%/Metalama/ExtractExceptions/**/*=>logs\n+:%system.teamcity.build.tempDir%/Metalama/Logs/**/*=>logs"
2828

2929
vcs {
3030
root(DslContext.settingsRoot)
@@ -51,7 +51,7 @@ object DebugBuild : BuildType({
5151
}
5252

5353
requirements {
54-
equals("env.BuildAgentType", "caravela02")
54+
equals("env.BuildAgentType", "caravela03")
5555
}
5656

5757
features {
@@ -67,7 +67,7 @@ object DebugBuild : BuildType({
6767
watchChangesInDependencies = true
6868
branchFilter = "+:<default>"
6969
// Build will not trigger automatically if the commit message contains comment value.
70-
triggerRules = "-:comment=<<VERSION_BUMP>>:**"
70+
triggerRules = "-:comment=<<VERSION_BUMP>>|<<DEPENDENCIES_UPDATED>>:**"
7171
}
7272

7373
}
@@ -86,7 +86,7 @@ object PublicBuild : BuildType({
8686

8787
name = "Build [Public]"
8888

89-
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private"
89+
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private\n+:artifacts/testResults/**/*=>artifacts/testResults\n+:artifacts/logs/**/*=>logs\n+:%system.teamcity.build.tempDir%/Metalama/AssemblyLocator/**/*=>logs\n+:%system.teamcity.build.tempDir%/Metalama/CompileTime/**/.completed=>logs\n+:%system.teamcity.build.tempDir%/Metalama/CompileTimeTroubleshooting/**/*=>logs\n+:%system.teamcity.build.tempDir%/Metalama/CrashReports/**/*=>logs\n+:%system.teamcity.build.tempDir%/Metalama/Extract/**/.completed=>logs\n+:%system.teamcity.build.tempDir%/Metalama/ExtractExceptions/**/*=>logs\n+:%system.teamcity.build.tempDir%/Metalama/Logs/**/*=>logs"
9090

9191
vcs {
9292
root(DslContext.settingsRoot)
@@ -113,7 +113,7 @@ object PublicBuild : BuildType({
113113
}
114114

115115
requirements {
116-
equals("env.BuildAgentType", "caravela02")
116+
equals("env.BuildAgentType", "caravela03")
117117
}
118118

119119
features {
@@ -155,7 +155,7 @@ object PublicDeployment : BuildType({
155155
}
156156

157157
requirements {
158-
equals("env.BuildAgentType", "caravela02")
158+
equals("env.BuildAgentType", "caravela03")
159159
}
160160

161161
features {
@@ -182,7 +182,7 @@ object PublicDeployment : BuildType({
182182

183183
artifacts {
184184
cleanDestination = true
185-
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private"
185+
artifactRules = "+:artifacts/publish/public/**/*=>artifacts/publish/public\n+:artifacts/publish/private/**/*=>artifacts/publish/private\n+:artifacts/testResults/**/*=>artifacts/testResults"
186186
}
187187
}
188188

@@ -212,7 +212,7 @@ object VersionBump : BuildType({
212212
}
213213

214214
requirements {
215-
equals("env.BuildAgentType", "caravela02")
215+
equals("env.BuildAgentType", "caravela03")
216216
}
217217

218218
features {

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Import Project="eng\Versions.props"/>
99
<Import Project="eng\Packaging.props"/>
1010
<Import Sdk="PostSharp.Engineering.Sdk" Project="BuildOptions.props"/>
11-
<Import Sdk="PostSharp.Engineering.Sdk" Project="CodeQuality.props"/>
11+
<Import Sdk="PostSharp.Engineering.Sdk" Project="TeamCity.props"/>
1212
<Import Sdk="PostSharp.Engineering.Sdk" Project="StrongName.props"/>
1313
<Import Sdk="PostSharp.Engineering.Sdk" Project="SourceLink.props"/>
1414

Directory.Build.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
<Import Sdk="PostSharp.Engineering.Sdk" Project="AssemblyMetadata.targets"/>
44
<Import Sdk="PostSharp.Engineering.Sdk" Project="TeamCity.targets"/>
5+
<Import Sdk="PostSharp.Engineering.Sdk" Project="CodeQuality.targets"/>
56

67
</Project>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<!-- Set the default versions of dependencies -->
1313
<PropertyGroup>
14-
<PostSharpEngineeringVersion>1.0.71-preview</PostSharpEngineeringVersion>
14+
<PostSharpEngineeringVersion>1.0.99-preview</PostSharpEngineeringVersion>
1515
<MetalamaVersion>branch:master</MetalamaVersion>
1616
</PropertyGroup>
1717

eng/src/Program.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright (c) SharpCrafters s.r.o. All rights reserved.
2-
// This project is not open source. Please see the LICENSE.md file in the repository root for details.
1+
// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
32

43
using PostSharp.Engineering.BuildTools;
54
using PostSharp.Engineering.BuildTools.Build.Model;
@@ -9,7 +8,10 @@
98

109
var product = new Product( Dependencies.MyProduct )
1110
{
12-
Solutions = new[] { new DotNetSolution( "src\\My.Product.sln" ) },
11+
Solutions = new Solution[]
12+
{
13+
new DotNetSolution( "src\\My.Product.sln" )
14+
},
1315
PublicArtifacts = Pattern.Create( "My.Product.$(PackageVersion).nupkg" ),
1416
Dependencies = new[] { Dependencies.PostSharpEngineering, Dependencies.Metalama }
1517
};

eng/style/.editorconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ root = true
77
#### Core EditorConfig Options ####
88

99
# File header
10-
file_header_template = Copyright (c) SharpCrafters s.r.o. All rights reserved.\nThis project is not open source. Please see the LICENSE.md file in the repository root for details.
10+
file_header_template = Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
1111

1212
# Indentation and spacing
1313
indent_size = 4
@@ -258,6 +258,10 @@ dotnet_diagnostic.SA1309.severity = none
258258
# SA1633: File should have header
259259
dotnet_diagnostic.SA1633.severity = none
260260

261+
# SA1636: File header should be correct
262+
dotnet_diagnostic.SA1636.severity = none
263+
264+
261265
# SA1200: Using directives should be placed within namespace
262266
dotnet_diagnostic.SA1200.severity = none
263267

eng/style/CommonStyle.DotSettings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Add_0020file_0020header/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Add file header"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="False" RemoveRedundantParentheses="False" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" ArrangeCodeBodyStyle="False" ArrangeVarStyle="False" ArrangeTrailingCommas="False" ArrangeObjectCreation="False" ArrangeDefaultValue="False" /&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;CppReformatCode&gt;True&lt;/CppReformatCode&gt;&lt;ShaderLabReformatCode&gt;True&lt;/ShaderLabReformatCode&gt;&lt;VBReformatCode&gt;True&lt;/VBReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;IDEA_SETTINGS&gt;&amp;lt;profile version="1.0"&amp;gt;&#xD;
147147
&amp;lt;option name="myName" value="Add file header" /&amp;gt;&#xD;
148148
&amp;lt;/profile&amp;gt;&lt;/IDEA_SETTINGS&gt;&lt;/Profile&gt;</s:String>
149-
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Custom/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Custom"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" /&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;IDEA_SETTINGS&gt;&amp;lt;profile version="1.0"&amp;gt;&#xD;
149+
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Custom/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Custom"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" /&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;IDEA_SETTINGS&gt;&amp;lt;profile version="1.0"&amp;gt;&#xD;
150150
&amp;lt;option name="myName" value="Custom" /&amp;gt;&#xD;
151151
&amp;lt;inspection_tool class="ES6ShorthandObjectProperty" enabled="false" level="INFORMATION" enabled_by_default="false" /&amp;gt;&#xD;
152152
&amp;lt;inspection_tool class="JSArrowFunctionBracesCanBeRemoved" enabled="false" level="INFORMATION" enabled_by_default="false" /&amp;gt;&#xD;

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100",
3+
"version": "6.0.401",
44
"rollForward": "disable"
55
},
66
"msbuild-sdks": {
7-
"PostSharp.Engineering.Sdk": "1.0.71-preview"
7+
"PostSharp.Engineering.Sdk": "1.0.99-preview"
88
}
99
}

src/My.Product/Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Copyright (c) SharpCrafters s.r.o. All rights reserved.
2-
// This project is not open source. Please see the LICENSE.md file in the repository root for details.
1+
// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
32

43
Console.WriteLine( "Hello, World!" );

0 commit comments

Comments
 (0)