Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Building projects for the supported Target framework #3209

Merged
merged 1 commit into from
May 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ binaries/
[Rr]elease/
build/
restoredPackages/
tools/net46/
tools/Microsoft.WindowsAzure.Build.Tasks/packages/
PublishedNugets/
src/NuGet.Config
tools/7-zip/
Expand Down
20 changes: 1 addition & 19 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,16 @@
<Scope Condition=" '$(Scope)' == '' ">All</Scope>
<NuGetCommand>&quot;$(LibraryToolsFolder)\nuget.exe&quot;</NuGetCommand>
<NuGetKey Condition=" '$(NuGetKey)' == '' ">1234</NuGetKey>
<BuildInParallel>true</BuildInParallel>
<NugetPackageName/>
<ImportDirectoryBuildTargets>true</ImportDirectoryBuildTargets>
<DefaultPathTokenToIgnore>$(IgnorePathTokens) Microsoft.Azure.KeyVault.Samples Gallery Intune FileConventions FileStaging ConfigureAwaitAnalyzer ObjectModelCodeGeneration Azure.Batch.IntegrationTests Azure.Batch.ProtocolTests IntegrationTestCommon</DefaultPathTokenToIgnore>
<!--Microsoft.Azure.KeyVault.Samples
ClientRuntime.Azure.TestFramework
Condition=" '$(IgnorePathTokens)' == '' "
ClientRuntime.Azure.TestFramework Microsoft.Azure.Test.HttpRecorder
-->
</PropertyGroup>
<PropertyGroup>
<CIToolsPath>$(OnPremiseBuildTasks)</CIToolsPath>
<OnPremiseBuild Condition=" Exists($(OnPremiseBuildTasks)) ">true</OnPremiseBuild>
<OnPremiseBuild Condition=" ! Exists($(OnPremiseBuildTasks)) ">false</OnPremiseBuild>
</PropertyGroup>

<PropertyGroup>
<BuildInParallel>true</BuildInParallel>
</PropertyGroup>

<ItemGroup Condition="'$(PublishTestProjects)' == 'false' Or '$(PublishTestProjects)' == ''">
<LibrariesToBuild Include="$(LibrarySourceFolder)\$(Scope)\*.sln" Condition=" '$(Scope)' != 'all' " />
<LibrariesToBuild Include="$(LibrarySourceFolder)\**\*.sln" Exclude="$(LibrarySourceFolder)\KeyVault\Microsoft.Azure.KeyVault.Samples\Microsoft.Azure.KeyVault.Samples.sln" Condition=" '$(Scope)' == 'all' " />
<LibraryFxTargetList Include="$(FxTargetList)" />
<AutoRestLibraryFxTargetList Include="portable;net45" />
<ClientRuntimeProjects Include="$(LibrarySourceFolder)\ClientRuntime\**\*.xproj"/>
<ClientRuntimeTests Include="$(LibrarySourceFolder)\ClientRuntime\*.Tests\*.xproj"/>
<ClientRuntimeRootDir Include="%(ClientRuntimeProjects.RootDir)"/>
</ItemGroup>

<PropertyGroup Label="Well Known Properties">
<ClientRuntimeRootDir>$(LibraryRoot)src\UpgradeVS17\SdkCommon\ClientRuntime</ClientRuntimeRootDir>
Expand Down
1 change: 1 addition & 0 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<Target Name="Build" DependsOnTargets="$(BuildTraversedProjectsDependsOn)" />
<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
<Target Name="PublishNuget" DependsOnTargets="$(PublishNugetDependsOn)" />
<Target Name="CreateNugetPackage" DependsOnTargets="$(PackageNugetDependsOn)" />
<Target Name="RunTests" DependsOnTargets="$(RunTestProjectsDependsOn)" />
<Target Name="SignNuget" DependsOnTargets="$(SignNugetDependsOn)" />
<Target Name="Help" DependsOnTargets="$(HelpDependsOn)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,7 @@ public void RoleAssignmentListForScopeTest()
}
}

//[Fact(Skip = "Graph issue when adding user to group, needs investigation")]
[Fact]
[Fact(Skip = "Graph issue when adding user to group, needs investigation")]
public void RoleAssignmentListWithAssignedToFilterTest()
{
HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
Expand Down

This file was deleted.

53 changes: 0 additions & 53 deletions src/SDKs/RedisCache/Management.Redis/project.json

This file was deleted.

21 changes: 0 additions & 21 deletions src/SDKs/RedisCache/RedisCache.Tests/RedisCache.Tests.xproj

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public CreateUpdateDeleteFunctionalTests(TestsFixture data)
fixture = data;
}

/*
[Fact(Skip = "Missing cleanup.json file")]
public void CreateUpdateDeleteTest()
{
Expand Down Expand Up @@ -93,5 +94,6 @@ public void CreateUpdateDeleteTest()
_client.Redis.Delete(resourceGroupName: fixture.ResourceGroupName, name: fixture.RedisCacheName);
}
}
*/
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public GetListKeysFunctionalTests(TestsFixtureWithCacheCreate data)
HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
}

/*
[Fact(Skip = "Missing cleanup.json file")]
public void GetTest()
{
Expand Down Expand Up @@ -146,6 +147,8 @@ public void RegenerateKeyTest()
}
}

*/

private static string GetSessionsDirectoryPath()
{
string executingAssemblyPath = typeof(AzureRedisCache.Tests.GetListKeysFunctionalTests).GetTypeInfo().Assembly.Location;
Expand Down
43 changes: 0 additions & 43 deletions src/SDKs/RedisCache/RedisCache.Tests/project.json

This file was deleted.

3 changes: 0 additions & 3 deletions src/SDKs/RedisCache/global.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void LogsRequest()
string actual = File.ReadAllText(logFileName);
Assert.Equal(expected, actual);
}

[Fact]
public void LogsResponse()
{
Expand Down Expand Up @@ -182,47 +182,4 @@ public void LogsNullExit()
Assert.Equal(expected, actual);
}
}

public class Log4NetTracingInterceptor
{
public Log4NetTracingInterceptor(string foo)
{

}

internal void Configuration(object p1, object p2, object p3)
{
throw new NotImplementedException();
}

internal void EnterMethod(string invocationId, object instance, string method, IDictionary<string, object> parameters)
{
throw new NotImplementedException();
}

internal void ExitMethod(string invocationId, string returnValue)
{
throw new NotImplementedException();
}

internal void Information(string infoMessage)
{
throw new NotImplementedException();
}

internal void ReceiveResponse(string invocationId, HttpResponseMessage response)
{
throw new NotImplementedException();
}

internal void SendRequest(string invocationId, HttpRequestMessage request)
{
throw new NotImplementedException();
}

internal void TraceError(string invocationId, HttpOperationException exception)
{
throw new NotImplementedException();
}
}
}
39 changes: 0 additions & 39 deletions src/SdkCommon/TestDependencies/Properties/AssemblyInfo.cs

This file was deleted.

Loading