Skip to content
This repository was archived by the owner on Nov 29, 2017. It is now read-only.

Commit f1be4b2

Browse files
bricelambricelam
committed
Normalizing line endings to CRLF.
1 parent 9498152 commit f1be4b2

File tree

847 files changed

+137548
-137548
lines changed

Some content is hidden

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

847 files changed

+137548
-137548
lines changed

‎EF.xunit.targets

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Xunit" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
4-
<!-- This is a separate MSBuild file so that we can survive upgrades of the xunit NuGet package
5-
and also still work with NuGet Package Restore. -->
6-
7-
<ItemGroup>
8-
<XunitMsBuildRunner Include="packages\**\xunit.runner.msbuild.dll"/>
9-
</ItemGroup>
10-
11-
<UsingTask TaskName="Xunit.Runner.MSBuild.xunit" AssemblyFile="@(XunitMsBuildRunner)"/>
12-
13-
<Target Name="Xunit">
14-
<xunit Assembly="test\EntityFramework\UnitTests\bin\$(Configuration)\EntityFramework.UnitTests.dll" Xml="test\EntityFramework\UnitTests\bin\$(Configuration)\EntityFramework.UnitTests.xml" ShadowCopy="true" />
15-
<xunit Assembly="test\EntityFramework\FunctionalTests\bin\$(Configuration)\EntityFramework.FunctionalTests.dll" Xml="test\EntityFramework\FunctionalTests\bin\$(Configuration)\EntityFramework.FunctionalTests.xml" ShadowCopy="true" />
16-
<xunit Assembly="test\EntityFramework\FunctionalTests.Transitional\bin\$(Configuration)\EntityFramework.FunctionalTests.Transitional.dll" Xml="test\EntityFramework\FunctionalTests.Transitional\bin\$(Configuration)\EntityFramework.FunctionalTests.Transitional.xml" ShadowCopy="true" />
17-
<xunit Condition="'$(Configuration)' != 'ReleaseNet40' And '$(Configuration)' != 'DebugNet40'" Assembly="test\EntityFramework\VBTests\bin\$(Configuration)\EntityFramework.VBTests.dll" Xml="test\EntityFramework\VBTests\bin\$(Configuration)\EntityFramework.VBTests.xml" ShadowCopy="true" />
18-
</Target>
19-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Xunit" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<!-- This is a separate MSBuild file so that we can survive upgrades of the xunit NuGet package
5+
and also still work with NuGet Package Restore. -->
6+
7+
<ItemGroup>
8+
<XunitMsBuildRunner Include="packages\**\xunit.runner.msbuild.dll"/>
9+
</ItemGroup>
10+
11+
<UsingTask TaskName="Xunit.Runner.MSBuild.xunit" AssemblyFile="@(XunitMsBuildRunner)"/>
12+
13+
<Target Name="Xunit">
14+
<xunit Assembly="test\EntityFramework\UnitTests\bin\$(Configuration)\EntityFramework.UnitTests.dll" Xml="test\EntityFramework\UnitTests\bin\$(Configuration)\EntityFramework.UnitTests.xml" ShadowCopy="true" />
15+
<xunit Assembly="test\EntityFramework\FunctionalTests\bin\$(Configuration)\EntityFramework.FunctionalTests.dll" Xml="test\EntityFramework\FunctionalTests\bin\$(Configuration)\EntityFramework.FunctionalTests.xml" ShadowCopy="true" />
16+
<xunit Assembly="test\EntityFramework\FunctionalTests.Transitional\bin\$(Configuration)\EntityFramework.FunctionalTests.Transitional.dll" Xml="test\EntityFramework\FunctionalTests.Transitional\bin\$(Configuration)\EntityFramework.FunctionalTests.Transitional.xml" ShadowCopy="true" />
17+
<xunit Condition="'$(Configuration)' != 'ReleaseNet40' And '$(Configuration)' != 'DebugNet40'" Assembly="test\EntityFramework\VBTests\bin\$(Configuration)\EntityFramework.VBTests.dll" Xml="test\EntityFramework\VBTests\bin\$(Configuration)\EntityFramework.VBTests.xml" ShadowCopy="true" />
18+
</Target>
19+
2020
</Project>

‎EntityFramework.sln.DotSettings

+62-62
Large diffs are not rendered by default.

‎License.txt

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
2-
Microsoft Open Technologies would like to thank its contributors, a list of whom
3-
are at http://aspnetwebstack.codeplex.com/wikipage?title=Contributors.
4-
5-
Licensed under the Apache License, Version 2.0 (the "License"); you
6-
may not use this file except in compliance with the License. You may
7-
obtain a copy of the License at
8-
9-
http://www.apache.org/licenses/LICENSE-2.0
10-
11-
Unless required by applicable law or agreed to in writing, software
12-
distributed under the License is distributed on an "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
14-
implied. See the License for the specific language governing permissions
1+
Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
2+
Microsoft Open Technologies would like to thank its contributors, a list of whom
3+
are at http://aspnetwebstack.codeplex.com/wikipage?title=Contributors.
4+
5+
Licensed under the Apache License, Version 2.0 (the "License"); you
6+
may not use this file except in compliance with the License. You may
7+
obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
14+
implied. See the License for the specific language governing permissions
1515
and limitations under the License.

‎PowerTools.sln

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 11
4-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2AE1B177-580C-44F1-9514-B3F23F4B1433}"
5-
EndProject
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerTools", "src\PowerTools\PowerTools.csproj", "{16CAD3A8-FCE0-4BC1-901A-16957CF24BD6}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerTools.Test", "test\PowerTools.Test\PowerTools.Test.csproj", "{ADCD3A3D-2564-48F3-81A9-B0B532675808}"
9-
EndProject
10-
Global
11-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12-
Debug|Any CPU = Debug|Any CPU
13-
Release|Any CPU = Release|Any CPU
14-
EndGlobalSection
15-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{16CAD3A8-FCE0-4BC1-901A-16957CF24BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{16CAD3A8-FCE0-4BC1-901A-16957CF24BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
18-
{16CAD3A8-FCE0-4BC1-901A-16957CF24BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
19-
{16CAD3A8-FCE0-4BC1-901A-16957CF24BD6}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{ADCD3A3D-2564-48F3-81A9-B0B532675808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{ADCD3A3D-2564-48F3-81A9-B0B532675808}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{ADCD3A3D-2564-48F3-81A9-B0B532675808}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{ADCD3A3D-2564-48F3-81A9-B0B532675808}.Release|Any CPU.Build.0 = Release|Any CPU
24-
EndGlobalSection
25-
GlobalSection(SolutionProperties) = preSolution
26-
HideSolutionNode = FALSE
27-
EndGlobalSection
28-
GlobalSection(NestedProjects) = preSolution
29-
{ADCD3A3D-2564-48F3-81A9-B0B532675808} = {2AE1B177-580C-44F1-9514-B3F23F4B1433}
30-
EndGlobalSection
31-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 11
4+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2AE1B177-580C-44F1-9514-B3F23F4B1433}"
5+
EndProject
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerTools", "src\PowerTools\PowerTools.csproj", "{16CAD3A8-FCE0-4BC1-901A-16957CF24BD6}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerTools.Test", "test\PowerTools.Test\PowerTools.Test.csproj", "{ADCD3A3D-2564-48F3-81A9-B0B532675808}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{16CAD3A8-FCE0-4BC1-901A-16957CF24BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{16CAD3A8-FCE0-4BC1-901A-16957CF24BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{16CAD3A8-FCE0-4BC1-901A-16957CF24BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{16CAD3A8-FCE0-4BC1-901A-16957CF24BD6}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{ADCD3A3D-2564-48F3-81A9-B0B532675808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{ADCD3A3D-2564-48F3-81A9-B0B532675808}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{ADCD3A3D-2564-48F3-81A9-B0B532675808}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{ADCD3A3D-2564-48F3-81A9-B0B532675808}.Release|Any CPU.Build.0 = Release|Any CPU
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
GlobalSection(NestedProjects) = preSolution
29+
{ADCD3A3D-2564-48F3-81A9-B0B532675808} = {2AE1B177-580C-44F1-9514-B3F23F4B1433}
30+
EndGlobalSection
31+
EndGlobal

‎samples/Provider/SampleEntityFrameworkProvider/Changelog.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Changes from Beta2:
2626
GetDbInformation(string, DbConnection) : XmlReader replaced with GetDbProviderManifest(DbConnection or string) :DbProviderManifest
2727

2828
Resources:
29-
All resources (.csdl, .ssdl, .msl, .xsd) were updated (from product code; it is difficult for me to explain the changes); providermanifest.xml has more changes than any other�
29+
All resources (.csdl, .ssdl, .msl, .xsd) were updated (from product code; it is difficult for me to explain the changes); providermanifest.xml has more changes than any other…
3030

3131
MetadataHelpers:
3232
Removed references to PrimitiveTypeKind.UInt* in GetDbType

‎src/EntityFramework.PowerShell/Utilities/Check.cs

+39-39
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
2-
3-
namespace System.Data.Entity.Utilities
4-
{
5-
using System.Data.Entity.Migrations.Resources;
6-
7-
internal class Check
8-
{
9-
public static T NotNull<T>(T value, string parameterName) where T : class
10-
{
11-
if (value == null)
12-
{
13-
throw new ArgumentNullException(parameterName);
14-
}
15-
16-
return value;
17-
}
18-
19-
public static T? NotNull<T>(T? value, string parameterName) where T : struct
20-
{
21-
if (value == null)
22-
{
23-
throw new ArgumentNullException(parameterName);
24-
}
25-
26-
return value;
27-
}
28-
29-
public static string NotEmpty(string value, string parameterName)
30-
{
31-
if (string.IsNullOrWhiteSpace(value))
32-
{
33-
throw new ArgumentException(Strings.ArgumentIsNullOrWhitespace(parameterName));
34-
}
35-
36-
return value;
37-
}
38-
}
39-
}
1+
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
2+
3+
namespace System.Data.Entity.Utilities
4+
{
5+
using System.Data.Entity.Migrations.Resources;
6+
7+
internal class Check
8+
{
9+
public static T NotNull<T>(T value, string parameterName) where T : class
10+
{
11+
if (value == null)
12+
{
13+
throw new ArgumentNullException(parameterName);
14+
}
15+
16+
return value;
17+
}
18+
19+
public static T? NotNull<T>(T? value, string parameterName) where T : struct
20+
{
21+
if (value == null)
22+
{
23+
throw new ArgumentNullException(parameterName);
24+
}
25+
26+
return value;
27+
}
28+
29+
public static string NotEmpty(string value, string parameterName)
30+
{
31+
if (string.IsNullOrWhiteSpace(value))
32+
{
33+
throw new ArgumentException(Strings.ArgumentIsNullOrWhitespace(parameterName));
34+
}
35+
36+
return value;
37+
}
38+
}
39+
}

‎src/EntityFramework.PowerShell/Utilities/DebugCheck.cs

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
2-
3-
namespace System.Data.Entity.Utilities
4-
{
5-
using System.Diagnostics;
6-
7-
internal class DebugCheck
8-
{
9-
[Conditional("DEBUG")]
10-
public static void NotNull<T>(T value) where T : class
11-
{
12-
Debug.Assert(value != null);
13-
}
14-
15-
[Conditional("DEBUG")]
16-
public static void NotNull<T>(T? value) where T : struct
17-
{
18-
Debug.Assert(value != null);
19-
}
20-
21-
[Conditional("DEBUG")]
22-
public static void NotEmpty(string value)
23-
{
24-
Debug.Assert(!string.IsNullOrWhiteSpace(value));
25-
}
26-
}
27-
}
1+
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
2+
3+
namespace System.Data.Entity.Utilities
4+
{
5+
using System.Diagnostics;
6+
7+
internal class DebugCheck
8+
{
9+
[Conditional("DEBUG")]
10+
public static void NotNull<T>(T value) where T : class
11+
{
12+
Debug.Assert(value != null);
13+
}
14+
15+
[Conditional("DEBUG")]
16+
public static void NotNull<T>(T? value) where T : struct
17+
{
18+
Debug.Assert(value != null);
19+
}
20+
21+
[Conditional("DEBUG")]
22+
public static void NotEmpty(string value)
23+
{
24+
Debug.Assert(!string.IsNullOrWhiteSpace(value));
25+
}
26+
}
27+
}

0 commit comments

Comments
 (0)