Skip to content

Commit 70c5f77

Browse files
committed
Migrate to latest donet core project format
1 parent d6475aa commit 70c5f77

7 files changed

+77
-10281
lines changed

gitattributes.sln

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,42 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.26730.16
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFCC326F-2A99-4985-8612-50C8DB63DBA3}"
76
ProjectSection(SolutionItems) = preProject
8-
global.json = global.json
97
NuGet.Config = NuGet.Config
108
README.md = README.md
119
EndProjectSection
1210
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "gitattributes", "src\gitattributes.xproj", "{D4639383-C092-498C-9317-41528E5489DB}"
11+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "gitattributes", "src\gitattributes.csproj", "{14CA240C-3D92-4958-8E1C-23C6298A4971}"
1412
EndProject
1513
Global
1614
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1715
Debug|Any CPU = Debug|Any CPU
16+
Debug|x64 = Debug|x64
17+
Debug|x86 = Debug|x86
1818
Release|Any CPU = Release|Any CPU
19+
Release|x64 = Release|x64
20+
Release|x86 = Release|x86
1921
EndGlobalSection
2022
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21-
{D4639383-C092-498C-9317-41528E5489DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
22-
{D4639383-C092-498C-9317-41528E5489DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
23-
{D4639383-C092-498C-9317-41528E5489DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
24-
{D4639383-C092-498C-9317-41528E5489DB}.Release|Any CPU.Build.0 = Release|Any CPU
23+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Debug|x64.ActiveCfg = Debug|Any CPU
26+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Debug|x64.Build.0 = Debug|Any CPU
27+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Debug|x86.ActiveCfg = Debug|Any CPU
28+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Debug|x86.Build.0 = Debug|Any CPU
29+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Release|x64.ActiveCfg = Release|Any CPU
32+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Release|x64.Build.0 = Release|Any CPU
33+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Release|x86.ActiveCfg = Release|Any CPU
34+
{14CA240C-3D92-4958-8E1C-23C6298A4971}.Release|x86.Build.0 = Release|Any CPU
2535
EndGlobalSection
2636
GlobalSection(SolutionProperties) = preSolution
2737
HideSolutionNode = FALSE
2838
EndGlobalSection
39+
GlobalSection(ExtensibilityGlobals) = postSolution
40+
SolutionGuid = {0FD1CB38-CA30-498C-92F7-FCEA7AF808CA}
41+
EndGlobalSection
2942
EndGlobal

global.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/Utils/PathResolver.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.IO;
77
using System.Linq;
88
using System.Text.RegularExpressions;
9-
using Microsoft.DotNet.Tools.Common;
109

1110
namespace NuGet
1211
{
@@ -46,7 +45,7 @@ private static Regex WildcardToRegex(string wildcard)
4645

4746
if (Path.DirectorySeparatorChar == '/')
4847
{
49-
pattern = Regex.Escape(PathUtility.GetPathWithForwardSlashes(wildcard));
48+
pattern = Regex.Escape(GetPathWithForwardSlashes(wildcard));
5049
// regex wildcard adjustments for *nix-style file systems
5150
pattern = pattern
5251
.Replace(@"\*\*/", "(.*/)?") //For recursive wildcards /**/, include the current directory.
@@ -261,6 +260,11 @@ private static bool IsEmptyDirectory(string directory)
261260
return !Directory.EnumerateFileSystemEntries(directory).Any();
262261
}
263262

263+
public static string GetPathWithForwardSlashes(string path)
264+
{
265+
return path.Replace('\\', '/');
266+
}
267+
264268
private struct SearchPathResult
265269
{
266270
private readonly string _path;

src/gitattributes.csproj

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>1.1.0</VersionPrefix>
5+
<TargetFramework>netcoreapp1.0</TargetFramework>
6+
<PreserveCompilationContext>true</PreserveCompilationContext>
7+
<AssemblyName>gitattributes</AssemblyName>
8+
<OutputType>Exe</OutputType>
9+
<PackageId>gitattributes</PackageId>
10+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
11+
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<None Update="wwwroot\**\*;Views\**\*">
16+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
17+
</None>
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
22+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.2" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
25+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />
26+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.2" />
27+
<PackageReference Include="NWebsec.AspNetCore.Middleware" Version="1.0.0-gamma1-15" />
28+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
29+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
30+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.2" />
31+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
33+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
34+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="1.0.0" />
35+
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
36+
</ItemGroup>
37+
38+
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
39+
<Exec Command="npm install" />
40+
<Exec Command="bower install" />
41+
<Exec Command="gulp copy" />
42+
</Target>
43+
44+
<ItemGroup>
45+
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
46+
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0" />
47+
</ItemGroup>
48+
49+
</Project>

src/gitattributes.xproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/project.json

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)