Skip to content

Commit

Permalink
Update packages and ensure we rollForward to prereleases
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoeRobich
JoeRobich committed Apr 11, 2022
1 parent 7e67969 commit db612fe
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 18 deletions.
6 changes: 4 additions & 2 deletions build.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ void BuildWithDotNetCli(BuildEnvironment env, string configuration)
.WithProperty("PackageVersion", env.VersionInfo.NuGetVersion)
.WithProperty("AssemblyVersion", env.VersionInfo.AssemblySemVer)
.WithProperty("FileVersion", env.VersionInfo.AssemblySemVer)
.WithProperty("InformationalVersion", env.VersionInfo.InformationalVersion);
.WithProperty("InformationalVersion", env.VersionInfo.InformationalVersion)
.WithProperty("RuntimeFrameworkVersion", "6.0.0-preview.7.21317.1"); // Set the minimum runtime to a .NET 6 prerelease so that prerelease SDKs will be considered during rollForward.

DotNetCoreMSBuild("OmniSharp.sln", settings);
}
Expand Down Expand Up @@ -573,7 +574,8 @@ string PublishBuild(string project, BuildEnvironment env, BuildPlan plan, string
.WithProperty("PackageVersion", env.VersionInfo.NuGetVersion)
.WithProperty("AssemblyVersion", env.VersionInfo.AssemblySemVer)
.WithProperty("FileVersion", env.VersionInfo.AssemblySemVer)
.WithProperty("InformationalVersion", env.VersionInfo.InformationalVersion),
.WithProperty("InformationalVersion", env.VersionInfo.InformationalVersion)
.WithProperty("RuntimeFrameworkVersion", "6.0.0-preview.7.21317.1"), // Set the minimum runtime to a .NET 6 prerelease so that prerelease SDKs will be considered during rollForward.
ToolPath = env.DotNetCommand,
WorkingDirectory = env.WorkingDirectory,
Verbosity = DotNetCoreVerbosity.Minimal,
Expand Down
8 changes: 4 additions & 4 deletions build/Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@
<PackageReference Update="OmniSharp.Extensions.LanguageProtocol.Testing" Version="0.19.0" />

<PackageReference Update="SQLitePCLRaw.bundle_green" Version="2.0.7" />
<PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Update="System.ComponentModel.Composition" Version="4.5.0" />
<PackageReference Update="System.Composition" Version="1.0.31" />
<PackageReference Update="System.Reflection.Metadata" Version="5.0.0" />
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="5.0.0" />
<PackageReference Update="System.Composition" Version="6.0.0" />
<PackageReference Update="System.Reflection.Metadata" Version="6.0.0" />
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
<PackageReference Update="System.ValueTuple" Version="4.5.0" />

<PackageReference Update="System.Reactive" Version="4.4.1" />
Expand Down
3 changes: 3 additions & 0 deletions omnisharp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@
"RoslynExtensionsOptions": {
"enableAnalyzersSupport": true,
"enableDecompilationSupport": true
},
"SDK": {
"includePrereleases": true
}
}
6 changes: 3 additions & 3 deletions src/OmniSharp.Http.Driver/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
6 changes: 3 additions & 3 deletions src/OmniSharp.LanguageServerProtocol/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
6 changes: 3 additions & 3 deletions src/OmniSharp.Stdio.Driver/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
6 changes: 3 additions & 3 deletions tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down

0 comments on commit db612fe

Please sign in to comment.