8000 Be explicit about what deprecated warnings are disabled · github/VisualStudio@bd9fa28 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit bd9fa28

Browse files
jcansdalejcansdale
committed
Be explicit about what deprecated warnings are disabled
1 parent f5c1ab4 commit bd9fa28

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

‎src/GitHub.App/Services/GitClient.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,16 @@ public GitClient(IGitHubCredentialProvider credentialProvider)
3636
};
3737
}
3838

39-
#pragma warning disable 0612, 0618
4039
public Task Pull(IRepository repository)
4140
{
4241
Guard.ArgumentNotNull(repository, nameof(repository));
4342

4443
return Task.Factory.StartNew(() =>
4544
{
4645
var signature = repository.Config.BuildSignature(DateTimeOffset.UtcNow);
46+
#pragma warning disable 0618 // Network.Pull is deprecated
4747
repository.Network.Pull(signature, pullOptions);
48+
#pragma warning restore 0618
4849
});
4950
}
5051

@@ -75,7 +76,9 @@ public Task Fetch(IRepository repository, string remoteName)
7576
try
7677
{
7778
var remote = repository.Network.Remotes[remoteName];
79+
#pragma warning disable 0618 // Network.Fetch is deprecated
7880
repository.Network.Fetch(remote, fetchOptions);
81+
#pragma warning restore 0618
7982
}
8083
catch (Exception ex)
8184
{
@@ -132,7 +135,9 @@ public Task Fetch(IRepository repository, string remoteName, params string[] ref
132135
try
133136
{
134137
var remote = repository.Network.Remotes[remoteName];
138+
#pragma warning disable 0618 // Network.Fetch is deprecated
135139
repository.Network.Fetch(remote, refspecs, fetchOptions);
140+
#pragma warning restore 0618
136141
}
137142
catch (Exception ex)
138143
{
@@ -151,7 +156,9 @@ public Task Checkout(IRepository repository, string branchName)
151156

152157
return Task.Factory.StartNew(() =>
153158
{
159+
#pragma warning disable 0618 // IRepository.Checkout is deprecated
154160
repository.Checkout(branchName);
161+
#pragma warning restore 0618
155162
});
156163
}
157164

‎src/GitHub.App/Services/PullRequestService.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,15 @@ public IObservable<Unit> Pull(ILocalRepositoryModel repository)
101101
});
102102
}
103103

104-
#pragma warning disable 0612, 0618
105104
public IObservable<Unit> Push(ILocalRepositoryModel repository)
106105
{
107106
return Observable.Defer(async () =>
108107
{
109108
var repo = gitService.GetRepository(repository.LocalPath);
110-
var remote = await gitClient.GetHttpRemote(repo, repo.Head.Remote.Name);
109+
#pragma warning disable 0618 // Branch.Remote is deprecated
110+
var remoteName = repo.Head.Remote.Name;
111+
#pragma warning restore 0618
112+
var remote = await gitClient.GetHttpRemote(repo, remoteName);
111113
return gitClient.Push(repo, repo.Head.TrackedBranch.UpstreamBranchCanonicalName, remote.Name).ToObservable();
112114
});
113115
}
@@ -166,16 +168,18 @@ public IObservable<string> GetDefaultLocalBranchName(ILocalRepositoryModel repos
166168
});
167169
}
168170

169-
#pragma warning disable 0612, 0618
170171
public IObservable<BranchTrackingDetails> CalculateHistoryDivergence(ILocalRepositoryModel repository, int pullRequestNumber)
171172
{
172173
return Observable.Defer(async () =>
173174
{
174175
var repo = gitService.GetRepository(repository.LocalPath);
175176

176-
if (repo.Head.Remote != null)
177+
#pragma warning disable 0618 // Branch.Remote is deprecated
178+
var headRemote = repo.Head.Remote;
179+
#pragma warning restore 0618
180+
if (headRemote != null)
177181
{
178-
var remote = await gitClient.GetHttpRemote(repo, repo.Head.Remote.Name);
182+
var remote = await gitClient.GetHttpRemote(repo, headRemote.Name);
179183
await gitClient.Fetch(repo, remote.Name);
180184
}
181185

@@ -368,10 +372,12 @@ public IObservable<Unit> RemoveUnusedRemotes(ILocalRepositoryModel repository)
368372
return Observable.Defer(async () =>
369373
{
370374
var repo = gitService.GetRepository(repository.LocalPath);
375+
#pragma warning disable 0618 // Branch.Remote is deprecated
371376
var usedRemotes = new HashSet<string>(
372377
repo.Branches
373378
.Where(x => !x.IsRemote && x.Remote != null)
374379
.Select(x => x.Remote?.Name));
380+
#pragma warning restore 0618
375381

376382
foreach (var remote in repo.Network.Remotes)
377383
{

‎src/GitHub.Exports/Models/BranchModel.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@ public BranchModel(Octokit.Branch branch, IRepositoryModel repo)
2525
Id = String.Format(CultureInfo.InvariantCulture, "{0}/{1}", Repository.Owner, Name);
2626
}
2727

28-
#pragma warning di 8CBA sable 0612, 0618
2928
public BranchModel(LibGit2Sharp.Branch branch, IRepositoryModel repo)
3029
{
3130
Extensions.Guard.ArgumentNotNull(branch, nameof(branch));
3231
Extensions.Guard.ArgumentNotNull(repo, nameof(repo));
3332

3433
Name = DisplayName = branch.FriendlyName;
35-
Repository = branch.IsRemote ? new LocalRepositoryModel(branch.Remote.Url) : repo;
34+
#pragma warning disable 0618 // Branch.Remote is deprecated
35+
var remoteUrl = branch.Remote.Url;
36+
#pragma warning restore 0618
37+
Repository = branch.IsRemote ? new LocalRepositoryModel(remoteUrl) : repo;
3638
IsTracking = branch.IsTracking;
3739
Id = String.Format(CultureInfo.InvariantCulture, "{0}/{1}", Repository.Owner, Name);
3840
}

0 commit comments

Comments
 (0)
0