Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit ee07c9f

Browse files
jogibear9988jogibear9988
committed
Merge remote-tracking branch 'upstream/master'
2 parents f05bf96 + 86a1715 commit ee07c9f

25 files changed

Lines changed: 121 additions & 108 deletions

‎src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void UpdatePackageInAllProjects()
189189

190190
PackageReference CreatePackageReference()
191191
{
192-
return new PackageReference(Id, Version, null, null);
192+
return new PackageReference(Id, Version, null, null, false, false);
193193
}
194194
}
195195
}

‎src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ public void FirePackageReferenceAddedEvent(PackageOperationEventArgs e)
183183
}
184184
}
185185

186-
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved;
186+
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoving;
187187

188-
public void FirePackageReferenceRemovedEvent(PackageOperationEventArgs e)
188+
public void FirePackageReferenceRemovingEvent(PackageOperationEventArgs e)
189189
{
190-
if (PackageReferenceRemoved != null) {
191-
PackageReferenceRemoved(this, e);
190+
if (PackageReferenceRemoving != null) {
191+
PackageReferenceRemoving(this, e);
192192
}
193193
}
194194

‎src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,10 @@ public void UpdatePackageReference(IPackage package, IUpdatePackageSettings sett
193193
PackagePassedToUpdatePackageReference = package;
194194
SettingsPassedToUpdatePackageReference = settings;
195195
}
196+
197+
public void InstallPackage(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions, bool ignoreWalkInfo)
198+
{
199+
throw new NotImplementedException();
200+
}
196201
}
197202
}

‎src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeProjectManager.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ protected virtual void OnPackageReferenceAdded(IPackage package)
3535
}
3636
}
3737

38-
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved;
38+
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoving;
3939

40-
protected virtual void OnPackageReferenceRemoved(IPackage package)
40+
protected virtual void OnPackageReferenceRemoving(IPackage package)
4141
{
42-
if (PackageReferenceRemoved != null) {
43-
PackageReferenceRemoved(this, new PackageOperationEventArgs(package, null, String.Empty));
42+
if (PackageReferenceRemoving != null) {
43+
PackageReferenceRemoving(this, new PackageOperationEventArgs(package, null, String.Empty));
4444
}
4545
}
4646

4747
#pragma warning disable 67
4848
public event EventHandler<PackageOperationEventArgs> PackageReferenceAdding;
49-
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoving;
49+
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved;
5050
#pragma warning restore 67
5151

5252
public IPackageRepository LocalRepository { get; set; }
@@ -87,9 +87,9 @@ public void FirePackageReferenceAdded(IPackage package)
8787
OnPackageReferenceAdded(package);
8888
}
8989

90-
public void FirePackageReferenceRemoved(IPackage package)
90+
public void FirePackageReferenceRemoving(IPackage package)
9191
{
92-
OnPackageReferenceRemoved(package);
92+
OnPackageReferenceRemoving(package);
9393
}
9494

9595
public void AddPackageReference(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)

‎src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public interface IPackageManagementProject
1515
event EventHandler<PackageOperationEventArgs> PackageInstalled;
1616
event EventHandler<PackageOperationEventArgs> PackageUninstalled;
1717
event EventHandler<PackageOperationEventArgs> PackageReferenceAdded;
18-
event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved;
18+
event EventHandler<PackageOperationEventArgs> PackageReferenceRemoving;
1919

2020
string Name { get; }
2121
ILogger Logger { get; set; }

‎src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public event EventHandler<PackageOperationEventArgs> PackageReferenceAdded {
6464
remove { projectManager.PackageReferenceAdded -= value; }
6565
}
6666

67-
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved {
68-
add { projectManager.PackageReferenceRemoved += value; }
69-
remove { projectManager.PackageReferenceRemoved -= value; }
67+
public event EventHandler<PackageOperationEventArgs> PackageReferenceRemoving {
68+
add { projectManager.PackageReferenceRemoving += value; }
69+
remove { projectManager.PackageReferenceRemoving -= value; }
7070
}
7171

7272
public bool IsPackageInstalled(IPackage package)

‎src/AddIns/Misc/PackageManagement/Project/Src/RegisteredPackageSources.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ namespace ICSharpCode.PackageManagement
1111
{
1212
public class RegisteredPackageSources : ObservableCollection<PackageSource>
1313
{
14-
public static readonly string DefaultPackageSourceUrl = "https://nuget.org/api/v2/";
15-
public static readonly string DefaultPackageSourceName = "NuGet Official Package Source";
14+
public static readonly string DefaultPackageSourceUrl = "https://www.nuget.org/api/v2/";
15+
public static readonly string DefaultPackageSourceName = "nuget.org";
1616

1717
public static readonly PackageSource DefaultPackageSource =
1818
new PackageSource(DefaultPackageSourceUrl, DefaultPackageSourceName);

‎src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunAllProjectPackageScriptsAction.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class RunAllProjectPackageScriptsAction : IDisposable
2222
List<EventHandler<PackageOperationEventArgs>> packageReferenceAddedHandlers =
2323
new List<EventHandler<PackageOperationEventArgs>>();
2424

25-
List<EventHandler<PackageOperationEventArgs>> packageReferenceRemovedHandlers =
25+
List<EventHandler<PackageOperationEventArgs>> packageReferenceRemovingHandlers =
2626
new List<EventHandler<PackageOperationEventArgs>>();
2727

2828
public RunAllProjectPackageScriptsAction(
@@ -68,7 +68,7 @@ void RegisterEvents()
6868
foreach (IPackageManagementProject project in projects) {
6969
RegisterPackageInstalledEvent(project);
7070
RegisterPackageReferenceAddedEvent(project);
71-
RegisterPackageReferenceRemovedEvent(project);
71+
RegisterPackageReferenceRemovingEvent(project);
7272
}
7373
}
7474

@@ -88,20 +88,20 @@ void RegisterPackageReferenceAddedEvent(IPackageManagementProject project)
8888
project.PackageReferenceAdded += referenceAddedHandler;
8989
}
9090

91-
void RegisterPackageReferenceRemovedEvent(IPackageManagementProject project)
91+
void RegisterPackageReferenceRemovingEvent(IPackageManagementProject project)
9292
{
93-
EventHandler<PackageOperationEventArgs> referenceRemovedHandler =
94-
(_, e) => PackageReferenceRemoved(project, e);
95-
packageReferenceRemovedHandlers.Add(referenceRemovedHandler);
96-
project.PackageReferenceRemoved += referenceRemovedHandler;
93+
EventHandler<PackageOperationEventArgs> referenceRemovingHandler =
94+
(_, e) => PackageReferenceRemoving(project, e);
95+
packageReferenceRemovingHandlers.Add(referenceRemovingHandler);
96+
project.PackageReferenceRemoving += referenceRemovingHandler;
9797
}
9898

9999
void UnregisterEvents()
100100
{
101101
foreach (IPackageManagementProject project in projects) {
102102
UnregisterPackageInstalledEvent(project);
103103
UnregisterPackageReferenceAddedEvent(project);
104-
UnregisterPackageReferenceRemovedEvent(project);
104+
UnregisterPackageReferenceRemovingEvent(project);
105105
}
106106
}
107107

@@ -119,11 +119,11 @@ void UnregisterPackageReferenceAddedEvent(IPackageManagementProject project)
119119
project.PackageReferenceAdded -= handler;
120120
}
121121

122-
void UnregisterPackageReferenceRemovedEvent(IPackageManagementProject project)
122+
void UnregisterPackageReferenceRemovingEvent(IPackageManagementProject project)
123123
{
124-
EventHandler<PackageOperationEventArgs> handler = packageReferenceRemovedHandlers.First();
125-
packageReferenceRemovedHandlers.Remove(handler);
126-
project.PackageReferenceRemoved -= handler;
124+
EventHandler<PackageOperationEventArgs> handler = packageReferenceRemovingHandlers.First();
125+
packageReferenceRemovingHandlers.Remove(handler);
126+
project.PackageReferenceRemoving -= handler;
127127
}
128128

129129
void PackageInstalled(IPackageManagementProject project, PackageOperationEventArgs e)
@@ -136,7 +136,7 @@ void PackageReferenceAdded(IPackageManagementProject project, PackageOperationEv
136136
RunInstallScript(project, e);
137137
}
138138

139-
void PackageReferenceRemoved(IPackageManagementProject project, PackageOperationEventArgs e)
139+
void PackageReferenceRemoving(IPackageManagementProject project, PackageOperationEventArgs e)
140140
{
141141
RunUninstallScript(project, e);
142142
}

‎src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunPackageScriptsAction.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@ void RegisterEvents()
3939
{
4040
project.PackageInstalled += PackageInstalled;
4141
project.PackageReferenceAdded += PackageReferenceAdded;
42-
project.PackageReferenceRemoved += PackageReferenceRemoved;
42+
project.PackageReferenceRemoving += PackageReferenceRemoving;
4343
}
4444

4545
void UnregisterEvents()
4646
{
4747
project.PackageInstalled -= PackageInstalled;
4848
project.PackageReferenceAdded -= PackageReferenceAdded;
49-
project.PackageReferenceRemoved -= PackageReferenceRemoved;
49+
project.PackageReferenceRemoving -= PackageReferenceRemoving;
5050
}
5151

5252
void PackageInstalled(object sender, PackageOperationEventArgs e)
5353
{
5454
RunInitScript(e);
5555
}
5656

57-
void PackageReferenceRemoved(object sender, PackageOperationEventArgs e)
57+
void PackageReferenceRemoving(object sender, PackageOperationEventArgs e)
5858
{
5959
RunUninstallScript(e);
6060
}

‎src/AddIns/Misc/PackageManagement/RequiredLibraries/Microsoft.Web.XmlTransform.dll‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)