Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 455e6e3

Browse files
committed
Merge feature/metrics into release/1.0.99.7
Conflicts: src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs src/GitHub.VisualStudio/Menus/CopyLink.cs src/GitHub.VisualStudio/Menus/OpenLink.cs src/UnitTests/GitHub.App/ViewModels/RepositoryCreationViewModelTests.cs
2 parents 7b4af27 + 5ed1718 commit 455e6e3

36 files changed

+590
-54
lines changed

GitHubVS.sln

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25029.0
4+
VisualStudioVersion = 14.0.25123.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\GitHub.VisualStudio\GitHub.VisualStudio.csproj", "{11569514-5AE5-4B5B-92A2-F10B0967DE5F}"
77
EndProject

script

src/CredentialManagement/CredentialManagement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<NuGetPackageImportStamp>
1515
</NuGetPackageImportStamp>
1616
<TargetFrameworkProfile />
17-
<BuildType Condition="Exists('..\..\script\ApiClientConfiguration.cs')">Internal</BuildType>
17+
<BuildType Condition="Exists('..\..\script\src\ApiClientConfiguration.cs')">Internal</BuildType>
1818
<OutputPath>bin\$(Configuration)\</OutputPath>
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

src/GitHub.Api/GitHub.Api.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>GitHub.Api</AssemblyName>
1212
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<BuildType Condition="Exists('..\..\script\ApiClientConfiguration.cs')">Internal</BuildType>
14+
<BuildType Condition="Exists('..\..\script\src\ApiClientConfiguration.cs')">Internal</BuildType>
1515
<OutputPath>bin\$(Configuration)\</OutputPath>
1616
<TargetFrameworkProfile />
1717
</PropertyGroup>

src/GitHub.App/GitHub.App.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<RunCodeAnalysis>true</RunCodeAnalysis>
2020
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
2121
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
22-
<BuildType Condition="Exists('..\..\script\ApiClientConfiguration.cs')">Internal</BuildType>
22+
<BuildType Condition="Exists('..\..\script\src\ApiClientConfiguration.cs')">Internal</BuildType>
2323
<OutputPath>bin\$(Configuration)\</OutputPath>
2424
<TargetFrameworkProfile />
2525
</PropertyGroup>
@@ -119,6 +119,9 @@
119119
<None Include="..\..\script\Key.snk" Condition="$(Buildtype) == 'Internal'">
120120
<Link>Key.snk</Link>
121121
</None>
122+
<Compile Include="..\..\script\src\MetricsService.cs" Condition="$(Buildtype) == 'Internal'">
123+
<Link>Services\MetricsService.cs</Link>
124+
</Compile>
122125
<Compile Include="Caches\CacheIndex.cs" />
123126
<Compile Include="Caches\CacheItem.cs" />
124127
<Compile Include="Caches\ImageCache.cs" />
@@ -153,7 +156,7 @@
153156
<Compile Include="..\common\SolutionInfo.cs">
154157
<Link>Properties\SolutionInfo.cs</Link>
155158
</Compile>
156-
<Compile Include="..\..\script\ApiClientConfiguration.cs" Condition="$(Buildtype) == 'Internal'">
159+
<Compile Include="..\..\script\src\ApiClientConfiguration.cs" Condition="$(Buildtype) == 'Internal'">
157160
<Link>Api\ApiClientConfiguration.cs</Link>
158161
</Compile>
159162
<Compile Include="Api\ApiClientConfiguration.cs" Condition="$(Buildtype) != 'Internal'" />
@@ -193,6 +196,7 @@
193196
<Compile Include="Services\StandardUserErrors.cs" />
194197
<Compile Include="Controllers\UIController.cs" />
195198
<Compile Include="Services\Translation.cs" />
199+
<Compile Include="Services\UsageTracker.cs" />
196200
<Compile Include="UserErrors\PublishRepositoryUserError.cs" />
197201
<Compile Include="UserErrors\PrivateRepositoryOnFreeAccountUserError.cs" />
198202
<Compile Include="UserErrors\PrivateRepositoryQuotaExceededUserError.cs" />

0 commit comments

Comments
 (0)