Merge branch 'release/2.2'
This commit is contained in:
unknown
commit
f62f96eb37
|
|
@ -17,8 +17,10 @@
|
|||
|
||||
<HasJdk Condition="Exists('$(JavacPath)')">true</HasJdk>
|
||||
|
||||
<!-- Pass the Java Package Version down to Gradle -->
|
||||
<GradleOptions>-PpackageVersion="$(JavaPackageVersion)"</GradleOptions>
|
||||
<!-- Disable gradle daemon on CI since the CI seems to try to wait for the daemon to shut down, which it doesn't do :) -->
|
||||
<GradleOptions Condition="'$(CI)' == 'true'">-Dorg.gradle.daemon=false</GradleOptions>
|
||||
<GradleOptions Condition="'$(CI)' == 'true'">$(GradleOptions) -Dorg.gradle.daemon=false</GradleOptions>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
@ -48,6 +50,7 @@
|
|||
|
||||
<Target Name="RunJavaTests" Condition="'$(HasJdk)' == 'true'">
|
||||
<Message Text="Running Java client tests" Importance="high" />
|
||||
<Message Text="> gradlew $(GradleOptions) test" Importance="high" />
|
||||
<Exec Command="./gradlew $(GradleOptions) test" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" IgnoreStandardErrorWarningFormat="true" />
|
||||
</Target>
|
||||
|
||||
|
|
@ -109,6 +112,7 @@
|
|||
|
||||
<Target Name="BuildJavaClient" Condition="'$(HasJdk)' == 'true'" DependsOnTargets="GetJavaArtifactInfo">
|
||||
<Message Text="Building Java client" Importance="high" />
|
||||
<Message Text="> gradlew $(GradleOptions) compileJava" Importance="high" />
|
||||
<Exec Command="./gradlew $(GradleOptions) compileJava" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
|
||||
</Target>
|
||||
|
||||
|
|
@ -126,14 +130,15 @@
|
|||
</Target>
|
||||
|
||||
<ItemGroup>
|
||||
<Jars Include="signalr-$(JavaClientVersion).jar;signalr-$(JavaClientVersion)-javadoc.jar;signalr-$(JavaClientVersion)-sources.jar;" />
|
||||
<PomFile Include="signalr-$(JavaClientVersion).pom" />
|
||||
<Jars Include="signalr-$(JavaPackageVersion).jar;signalr-$(JavaPackageVersion)-javadoc.jar;signalr-$(JavaPackageVersion)-sources.jar;" />
|
||||
<PomFile Include="signalr-$(JavaPackageVersion).pom" />
|
||||
<JavaBuildFiles Include="@(Jars);@(PomFile)"/>
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="PackJavaClient" Condition="'$(HasJdk)' == 'true'">
|
||||
<Message Text="Packing Java client" Importance="high" />
|
||||
<Exec Command="./gradlew $(GradleOptions) jar sourceJar javadocJar generatePOM" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
|
||||
<Message Text="> gradlew $(GradleOptions) createPackage" Importance="high" />
|
||||
<Exec Command="./gradlew $(GradleOptions) createPackage" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
|
||||
<Copy SourceFiles="$(RepositoryRoot)clients/java/signalr\build\libs\%(JavaBuildFiles.Identity)" DestinationFolder="$(BuildDir)" />
|
||||
</Target>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@ plugins {
|
|||
}
|
||||
|
||||
group 'com.microsoft.aspnet'
|
||||
version '0.1.0-preview1'
|
||||
|
||||
// If we're run from outside MSBuild, just assign a bogus dev version.
|
||||
version project.findProperty('packageVersion') ?: "99.99.99-dev"
|
||||
|
||||
sourceCompatibility = 1.8
|
||||
|
||||
|
|
@ -54,8 +56,7 @@ task generatePOM {
|
|||
}
|
||||
}
|
||||
}
|
||||
}.writeTo("signalr-0.1.0-preview1.pom")
|
||||
|
||||
ant.move file: "signalr-0.1.0-preview1.pom",
|
||||
todir: "${buildDir}/libs"
|
||||
}.writeTo("${buildDir}/libs/signalr-${project.version}.pom")
|
||||
}
|
||||
|
||||
task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM])
|
||||
|
|
|
|||
|
|
@ -66,6 +66,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
|||
private static readonly Action<ILogger, Exception> _cancelMessage =
|
||||
LoggerMessage.Define(LogLevel.Debug, new EventId(18, "CancelMessage"), "Canceled passing message to application.");
|
||||
|
||||
private static readonly Action<ILogger, Exception> _startedTransport =
|
||||
LoggerMessage.Define(LogLevel.Debug, new EventId(19, "StartedTransport"), "Started transport.");
|
||||
|
||||
public static void StartTransport(ILogger logger, TransferFormat transferFormat, Uri webSocketUrl)
|
||||
{
|
||||
_startTransport(logger, transferFormat, webSocketUrl, null);
|
||||
|
|
@ -155,6 +158,11 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
|||
{
|
||||
_cancelMessage(logger, null);
|
||||
}
|
||||
|
||||
public static void StartedTransport(ILogger logger)
|
||||
{
|
||||
_startedTransport(logger, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,8 +107,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
|||
|
||||
var resolvedUrl = ResolveWebSocketsUrl(url);
|
||||
|
||||
Log.StartTransport(_logger, transferFormat, resolvedUrl);
|
||||
|
||||
// We don't need to capture to a local because we never change this delegate.
|
||||
if (_accessTokenProvider != null)
|
||||
{
|
||||
|
|
@ -119,8 +117,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
|||
}
|
||||
}
|
||||
|
||||
Log.StartTransport(_logger, transferFormat, resolvedUrl);
|
||||
|
||||
await _webSocket.ConnectAsync(resolvedUrl, CancellationToken.None);
|
||||
|
||||
Log.StartedTransport(_logger);
|
||||
|
||||
// Create the pipe pair (Application's writer is connected to Transport's reader, and vice versa)
|
||||
var options = ClientPipeOptions.DefaultOptions;
|
||||
var pair = DuplexPipe.CreateConnectionPair(options, options);
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<JavaClientVersion>0.1.0-preview1</JavaClientVersion>
|
||||
<VersionPrefix>3.0.0</VersionPrefix>
|
||||
<VersionSuffix>alpha1</VersionSuffix>
|
||||
<JavaVersionPrefix>0.1.0</JavaVersionPrefix>
|
||||
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
|
||||
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
|
||||
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
|
||||
<JavaPackageVersion>$(JavaVersionPrefix)-$(VersionSuffix)-$(BuildNumber)</JavaPackageVersion>
|
||||
<JavaPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(JavaVersionPrefix)-$(VersionSuffix)</JavaPackageVersion>
|
||||
<JavaPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(JavaVersionPrefix)-$(VersionSuffix)-final</JavaPackageVersion>
|
||||
<FeatureBranchVersionPrefix Condition="'$(FeatureBranchVersionPrefix)' == ''">a-</FeatureBranchVersionPrefix>
|
||||
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
|
||||
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
|
||||
|
|
|
|||
Loading…
Reference in New Issue