Skip to content

Commit 9834d51

Browse files
jbamptonjbampton
authored
pre-commit: standardize more line endings to lf (#7804)
https://github.com/pre-commit/pre-commit-hooks#mixed-line-ending
1 parent 8eaf264 commit 9834d51

File tree

14 files changed

+2074
-2074
lines changed

14 files changed

+2074
-2074
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ repos:
5252
exclude: \.vhd$
5353
#- id: fix-byte-order-marker
5454
- id: mixed-line-ending
55-
files: \.(java|md|py|txt|yaml|yml)$
55+
exclude: \.(cs|xml)$
5656
# - id: trailing-whitespace
5757
- repo: https://github.com/pycqa/flake8
5858
rev: 6.1.0

‎engine/schema/src/main/resources/META-INF/db/schema-302to303.sql‎

Lines changed: 196 additions & 196 deletions
Large diffs are not rendered by default.

‎engine/schema/src/main/resources/META-INF/db/schema-304to305.sql‎

Lines changed: 389 additions & 389 deletions
Large diffs are not rendered by default.

‎engine/service/src/main/webapp/index.jsp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
-->
19-
<html>
20-
<body>
21-
<h2>Hello World!</h2>
22-
</body>
23-
</html>
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<html>
20+
<body>
21+
<h2>Hello World!</h2>
22+
</body>
23+
</html>

‎plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.Config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<configuration>
3-
<solution>
4-
<add key="disableSourceControlIntegration" value="true" />
5-
</solution>
6-
</configuration>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
6+
</configuration>

‎plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets‎

Lines changed: 113 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
44
Licensed to the Apache Software Foundation (ASF) under one
@@ -19,134 +19,134 @@
1919
under the License.
2020
2121
-->
22-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
23-
<PropertyGroup>
24-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
25-
26-
<!-- Enable the restore command to run before builds -->
27-
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
28-
29-
<!-- Property that enables building a package from a project -->
30-
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
31-
32-
<!-- Determines if package restore consent is required to restore packages -->
33-
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
34-
35-
<!-- Download NuGet.exe if it does not already exist -->
36-
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
37-
</PropertyGroup>
38-
<ItemGroup Condition=" '$(PackageSources)' == '' ">
39-
<!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
40-
<!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
41-
<!--
42-
<PackageSource Include="https://www.nuget.org/api/v2/" />
43-
<PackageSource Include="https://my-nuget-source/nuget/" />
44-
-->
45-
</ItemGroup>
46-
22+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
23+
<PropertyGroup>
24+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
25+
26+
<!-- Enable the restore command to run before builds -->
27+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
28+
29+
<!-- Property that enables building a package from a project -->
30+
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
31+
32+
<!-- Determines if package restore consent is required to restore packages -->
33+
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
34+
35+
<!-- Download NuGet.exe if it does not already exist -->
36+
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
37+
</PropertyGroup>
38+
<ItemGroup Condition=" '$(PackageSources)' == '' ">
39+
<!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
40+
<!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
41+
<!--
42+
<PackageSource Include="https://www.nuget.org/api/v2/" />
43+
<PackageSource Include="https://my-nuget-source/nuget/" />
44+
-->
45+
</ItemGroup>
46+
4747
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' And '$(BuildWithMono)' != 'true'">
48-
<!-- Windows specific commands -->
49-
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
50-
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
51-
</PropertyGroup>
48+
<!-- Windows specific commands -->
49+
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
50+
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
51+
</PropertyGroup>
5252

5353
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' Or '$(BuildWithMono)' == 'true'">
54-
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
55-
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
54+
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
55+
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
5656
<PackagesConfig>$(ProjectDir)packages.config</PackagesConfig>
57-
</PropertyGroup>
57+
</PropertyGroup>
5858

59-
<PropertyGroup>
60-
<!-- NuGet command -->
61-
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
62-
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
59+
<PropertyGroup>
60+
<!-- NuGet command -->
61+
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
62+
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
6363

6464
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT' And '$(BuildWithMono)' != 'true' ">"$(NuGetExePath)"</NuGetCommand>
6565
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' Or '$(BuildWithMono)' == 'true' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
66-
67-
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
6866

69-
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
70-
<NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
71-
72-
<!-- Commands -->
67+
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
68+
69+
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
70+
<NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
71+
72+
<!-- Commands -->
7373
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir "$(SolutionDir)\" </RestoreCommand>
7474
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties Configuration=$(Configuration) $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
75-
76-
<!-- We need to ensure packages are restored prior to assembly resolve -->
77-
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
78-
RestorePackages;
79-
$(BuildDependsOn);
80-
</BuildDependsOn>
81-
82-
<!-- Make the build depend on restore packages -->
83-
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
84-
$(BuildDependsOn);
85-
BuildPackage;
86-
</BuildDependsOn>
87-
</PropertyGroup>
88-
89-
<Target Name="CheckPrerequisites">
90-
<!-- Raise an error if we're unable to locate nuget.exe -->
91-
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
92-
<!--
93-
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
94-
This effectively acts as a lock that makes sure that the download operation will only happen once and all
95-
parallel builds will have to wait for it to complete.
96-
-->
97-
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
98-
</Target>
99-
100-
<Target Name="_DownloadNuGet">
101-
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
102-
</Target>
103-
104-
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
105-
<Exec Command="$(RestoreCommand)"
75+
76+
<!-- We need to ensure packages are restored prior to assembly resolve -->
77+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
78+
RestorePackages;
79+
$(BuildDependsOn);
80+
</BuildDependsOn>
81+
82+
<!-- Make the build depend on restore packages -->
83+
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
84+
$(BuildDependsOn);
85+
BuildPackage;
86+
</BuildDependsOn>
87+
</PropertyGroup>
88+
89+
<Target Name="CheckPrerequisites">
90+
<!-- Raise an error if we're unable to locate nuget.exe -->
91+
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
92+
<!--
93+
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
94+
This effectively acts as a lock that makes sure that the download operation will only happen once and all
95+
parallel builds will have to wait for it to complete.
96+
-->
97+
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
98+
</Target>
99+
100+
<Target Name="_DownloadNuGet">
101+
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
102+
</Target>
103+
104+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
105+
<Exec Command="$(RestoreCommand)"
106106
Condition="( '$(OS)' != 'Windows_NT' Or '$(BuildWithMono)' == 'true' ) And Exists('$(PackagesConfig)')" />
107107

108-
<Exec Command="$(RestoreCommand)"
109-
LogStandardErrorAsError="true"
108+
<Exec Command="$(RestoreCommand)"
109+
LogStandardErrorAsError="true"
110110
Condition="'$(OS)' == 'Windows_NT' And '$(BuildWithMono)' != 'true' And Exists('$(PackagesConfig)')" />
111-
</Target>
112-
113-
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
111+
</Target>
112+
113+
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
114114
<Exec Command="$(BuildCommand)"
115115
Condition=" '$(OS)' != 'Windows_NT' Or '$(BuildWithMono)' " />
116116

117-
<Exec Command="$(BuildCommand)"
118-
LogStandardErrorAsError="true"
117+
<Exec Command="$(BuildCommand)"
118+
LogStandardErrorAsError="true"
119119
Condition=" '$(OS)' == 'Windows_NT' And '$(BuildWithMono)' != 'true' " />
120-
</Target>
121-
122-
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
123-
<ParameterGroup>
124-
<OutputFilename ParameterType="System.String" Required="true" />
125-
</ParameterGroup>
126-
<Task>
127-
<Reference Include="System.Core" />
128-
<Using Namespace="System" />
129-
<Using Namespace="System.IO" />
130-
<Using Namespace="System.Net" />
131-
<Using Namespace="Microsoft.Build.Framework" />
132-
<Using Namespace="Microsoft.Build.Utilities" />
133-
<Code Type="Fragment" Language="cs">
134-
<![CDATA[
135-
try {
136-
OutputFilename = Path.GetFullPath(OutputFilename);
137-
138-
Log.LogMessage("Downloading latest version of NuGet.exe...");
139-
WebClient webClient = new WebClient();
140-
webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
141-
142-
return true;
143-
}
144-
catch (Exception ex) {
145-
Log.LogErrorFromException(ex);
146-
return false;
147-
}
148-
]]>
149-
</Code>
150-
</Task>
151-
</UsingTask>
120+
</Target>
121+
122+
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
123+
<ParameterGroup>
124+
<OutputFilename ParameterType="System.String" Required="true" />
125+
</ParameterGroup>
126+
<Task>
127+
<Reference Include="System.Core" />
128+
<Using Namespace="System" />
129+
<Using Namespace="System.IO" />
130+
<Using Namespace="System.Net" />
131+
<Using Namespace="Microsoft.Build.Framework" />
132+
<Using Namespace="Microsoft.Build.Utilities" />
133+
<Code Type="Fragment" Language="cs">
134+
<![CDATA[
135+
try {
136+
OutputFilename = Path.GetFullPath(OutputFilename);
137+
138+
Log.LogMessage("Downloading latest version of NuGet.exe...");
139+
WebClient webClient = new WebClient();
140+
webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
141+
142+
return true;
143+
}
144+
catch (Exception ex) {
145+
Log.LogErrorFromException(ex);
146+
return false;
147+
}
148+
]]>
149+
</Code>
150+
</Task>
151+
</UsingTask>
152152
</Project>

0 commit comments

Comments
 (0)