Skip to content

Commit 7b55679

Browse files
authored
Merge pull request Azure#8527 from ankushbindlish2/Az-StorageSync-v5-Final
Add Az.StorageSync Cmdlets supported by Microsoft.StorageSync RP - v5 version
2 parents dfb59bd + b6d4314 commit 7b55679

File tree

258 files changed

+78651
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+78651
-433
lines changed

build.proj

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@
4949
<LibrarySourceFolder>$(LibraryRoot)src</LibrarySourceFolder>
5050
<LibraryToolsFolder>$(LibraryRoot)tools</LibraryToolsFolder>
5151
<LibraryArtifactsFolder>$(LibraryRoot)artifacts</LibraryArtifactsFolder>
52-
<LocalFeedFolder>$(LibraryToolsFolder)\LocalFeed</LocalFeedFolder>
52+
<LocalFeedFolder>$(LibraryToolsFolder)/LocalFeed</LocalFeedFolder>
5353
<Configuration Condition=" '$(Configuration)' != 'Release'">Debug</Configuration>
5454
<CodeSign>false</CodeSign>
5555
<!--Set this true only if you want to test the code sign workflow locally-->
5656
<DelaySign Condition =" '$(DelaySign)' == '' ">false</DelaySign>
5757
<SignedOutputRootDir>$(LibraryRoot)signed</SignedOutputRootDir>
58-
<PackageDirectory>$(LibraryRoot)\artifacts</PackageDirectory>
59-
<TestOutputDirectory>$(PackageDirectory)\Test</TestOutputDirectory>
58+
<PackageDirectory>$(LibraryRoot)artifacts</PackageDirectory>
59+
<TestOutputDirectory>$(PackageDirectory)/Test</TestOutputDirectory>
6060
<BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
6161
<NuGetPublishingSource Condition=" '$(NuGetPublishingSource)' == '' ">$(LibrarySourceFolder)</NuGetPublishingSource>
6262
<Scope Condition="$(Scope) == ''" >All</Scope>
63-
<BuildTasksPath>$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks\bin\$(Configuration)</BuildTasksPath>
64-
<StackPackageFolder>$(LibrarySourceFolder)\Stack</StackPackageFolder>
63+
<BuildTasksPath>$(LibraryToolsFolder)/BuildPackagesTask/Microsoft.Azure.Build.Tasks/bin/$(Configuration)</BuildTasksPath>
64+
<StackPackageFolder>$(LibrarySourceFolder)/Stack</StackPackageFolder>
6565
<NetCore Condition="'$(NetCore)' != 'true'">false</NetCore>
6666
</PropertyGroup>
6767

@@ -131,7 +131,7 @@
131131
<Message Importance="high" Text="Cleaning Cmdlets..." />
132132

133133
<!-- Clean out the NuGet cache -->
134-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Remove-Item -Path (Join-Path ($env:USERPROFILE) .nuget packages) -Recurse -Force -Confirm:$false -ErrorAction Ignore&quot;" ContinueOnError="WarnAndContinue" IgnoreExitCode="true" />
134+
<Exec Command="dotnet nuget locals global-packages --clear" ContinueOnError="WarnAndContinue" IgnoreExitCode="true" />
135135

136136
<!-- Remove Package, Publish, bin, obj, and TestResults directories -->
137137
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Remove-Item -Path $(PackageDirectory) -Recurse -Force -Confirm:$false -ErrorAction Ignore&quot;" ContinueOnError="WarnAndContinue" IgnoreExitCode="true" />
@@ -386,6 +386,7 @@
386386
<CallTarget Targets="BinScopeCheck" Condition="'$(OnPremiseBuild)'" />
387387
<CallTarget Targets="RunPoliCheck" Condition="'$(OnPremiseBuild)'" />
388388

389+
<Message Importance="High" Text="Creating test output directory at '$(TestOutputDirectory)'" />
389390
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
390391
<Exec Command="dotnet new sln -n Azure.PowerShell --force" />
391392
<ItemGroup>
@@ -401,12 +402,7 @@
401402
<Exec Command="dotnet sln Azure.PowerShell.sln add $(LibraryRoot)tools/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.csproj $(LibraryRoot)tools/TestFx/TestFx.csproj" />
402403
<!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
403404
<!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
404-
<Exec Command="dotnet test Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework $(Framework) --logger trx" />
405-
406-
<ItemGroup>
407-
<TestResults Include="$(LibraryRoot)src/**/TestResults/*.trx" />
408-
</ItemGroup>
409-
<Copy SourceFiles="@(TestResults)" DestinationFolder="$(TestOutputDirectory)" />
405+
<Exec Command="dotnet test Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework netcoreapp2.0 --logger trx --results-directory &quot;$(TestOutputDirectory)&quot;" />
410406

411407
<OnError ExecuteTargets="TestFailureErrorMessage" />
412408
</Target>
@@ -464,4 +460,4 @@
464460
<Error Text="PoliCheck failed with a Severity 1 issue, please check the report at in artifacts/PoliCheck-Scan.html" />
465461
</Target>
466462

467-
</Project>
463+
</Project>

src/Accounts/Accounts/Accounts.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313
<ItemGroup>
1414
<PreLoadAssemblies Include="$(RepoSrc)lib\Newtonsoft.Json.10.dll" />
1515
<PreLoadAssemblies Include="$(RepoSrc)lib\System.Buffers.dll" />
16+
<PreLoadAssemblies Include="$(RepoSrc)lib\System.Net.Http.WinHttpHandler.dll" />
17+
<PreLoadAssemblies Include="$(RepoSrc)lib\System.Private.ServiceModel.dll" />
1618
<PreLoadAssemblies Include="$(RepoSrc)lib\System.Reflection.DispatchProxy.dll" />
17-
<PreLoadAssemblies Include="$(RepoSrc)lib\System.ServiceModel.Primitives.dll" />
19+
<PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.AccessControl.dll" />
1820
<PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.Permissions.dll" />
19-
<PreLoadAssemblies Include="$(RepoSrc)lib\System.Private.ServiceModel.dll" />
20-
<PreLoadAssemblies Include="$(RepoSrc)lib\System.Net.Http.WinHttpHandler.dll" />
21+
<PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.Principal.Windows.dll" />
22+
<PreLoadAssemblies Include="$(RepoSrc)lib\System.ServiceModel.Primitives.dll" />
2123
<PreLoadAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetFx\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
2224
<PreLoadAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetFx\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" />
2325
<NetCoreAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetCore\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />

src/Accounts/Accounts/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Add additional framework extensions for .Net Framework execution
2122

2223
## Version 1.3.0
2324
* Update to latest version of ClientRuntime

0 commit comments

Comments
 (0)