Skip to content
This repository was archived by the owner on Jan 19, 2021. It is now read-only.

Commit d657538

Browse files
committed
Merge pull request #242 from OfficeDev/dev
February 2016 - Intermediate release
2 parents f70a092 + 5a86a66 commit d657538

8 files changed

+69
-3
lines changed

Binaries/PnPPowerShellCommands15.msi

8 KB
Binary file not shown.

Binaries/PnPPowerShellCommands16.msi

8 KB
Binary file not shown.

Commands/ModuleFiles/OfficeDevPnP.PowerShell.V15.Commands.Format.ps1xml

+32
Original file line numberDiff line numberDiff line change
@@ -563,5 +563,37 @@
563563
</TableRowEntries>
564564
</TableControl>
565565
</View>
566+
<View>
567+
<Name>File</Name>
568+
<ViewSelectedBy>
569+
<TypeName>Microsoft.SharePoint.Client.File</TypeName>
570+
</ViewSelectedBy>
571+
<TableControl>
572+
<TableHeaders>
573+
<TableColumnHeader>
574+
<Label>Name</Label>
575+
<Width>30</Width>
576+
<Alignment>left</Alignment>
577+
</TableColumnHeader>
578+
<TableColumnHeader>
579+
<Label>Length</Label>
580+
<Width>10</Width>
581+
<Alignment>left</Alignment>
582+
</TableColumnHeader>
583+
</TableHeaders>
584+
<TableRowEntries>
585+
<TableRowEntry>
586+
<TableColumnItems>
587+
<TableColumnItem>
588+
<PropertyName>Name</PropertyName>
589+
</TableColumnItem>
590+
<TableColumnItem>
591+
<PropertyName>Length</PropertyName>
592+
</TableColumnItem>
593+
</TableColumnItems>
594+
</TableRowEntry>
595+
</TableRowEntries>
596+
</TableControl>
597+
</View>
566598
</ViewDefinitions>
567599
</Configuration>
Binary file not shown.

Commands/ModuleFiles/OfficeDevPnP.PowerShell.V16.Commands.Format.ps1xml

+32
Original file line numberDiff line numberDiff line change
@@ -563,5 +563,37 @@
563563
</TableRowEntries>
564564
</TableControl>
565565
</View>
566+
<View>
567+
<Name>File</Name>
568+
<ViewSelectedBy>
569+
<TypeName>Microsoft.SharePoint.Client.File</TypeName>
570+
</ViewSelectedBy>
571+
<TableControl>
572+
<TableHeaders>
573+
<TableColumnHeader>
574+
<Label>Name</Label>
575+
<Width>30</Width>
576+
<Alignment>left</Alignment>
577+
</TableColumnHeader>
578+
<TableColumnHeader>
579+
<Label>Length</Label>
580+
<Width>10</Width>
581+
<Alignment>left</Alignment>
582+
</TableColumnHeader>
583+
</TableHeaders>
584+
<TableRowEntries>
585+
<TableRowEntry>
586+
<TableColumnItems>
587+
<TableColumnItem>
588+
<PropertyName>Name</PropertyName>
589+
</TableColumnItem>
590+
<TableColumnItem>
591+
<PropertyName>Length</PropertyName>
592+
</TableColumnItem>
593+
</TableColumnItems>
594+
</TableRowEntry>
595+
</TableRowEntries>
596+
</TableControl>
597+
</View>
566598
</ViewDefinitions>
567599
</Configuration>
Binary file not shown.

Commands/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939
// You can specify all the values or you can default the Build and Revision Numbers
4040
// by using the '*' as shown below:
4141
// [assembly: AssemblyVersion("1.0.*")]
42-
[assembly: AssemblyVersion("2.1.1602.0")]
43-
[assembly: AssemblyFileVersion("2.1.1602.0")]
42+
[assembly: AssemblyVersion("2.1.1602.1")]
43+
[assembly: AssemblyFileVersion("2.1.1602.1")]

Commands/Web/AddFile.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected override void ExecuteCmdlet()
7777
}
7878
}
7979

80-
folder.UploadFile(new FileInfo(Path).Name, Path, true);
80+
var file = folder.UploadFile(new FileInfo(Path).Name, Path, true);
8181

8282
if (Checkout)
8383
SelectedWeb.CheckInFile(fileUrl, CheckinType.MajorCheckIn, "");
@@ -87,6 +87,8 @@ protected override void ExecuteCmdlet()
8787

8888
if (Approve)
8989
SelectedWeb.ApproveFile(fileUrl, PublishComment);
90+
91+
WriteObject(file);
9092
}
9193
}
9294
}

0 commit comments

Comments
 (0)