Fix package versions.

This commit is contained in:
Jeremy Koritzinsky
2018-10-28 13:35:37 -07:00
parent 054909de78
commit 45ae6aac23
3 changed files with 17 additions and 10 deletions
+16
View File
@@ -85,6 +85,13 @@ void DotNetCoreBuild(Parameters parameters)
var settings = new DotNetCoreBuildSettings
{
Configuration = parameters.Configuration,
MSBuildSettings = new DotNetCoreMSBuildSettings
{
Properties =
{
{ "PackageVersion", new [] { parameters.Version } }
}
}
};
DotNetCoreBuild(parameters.MSBuildSolution, settings);
@@ -99,6 +106,7 @@ Task("Build-Impl")
settings.SetConfiguration(data.Configuration);
settings.SetVerbosity(Verbosity.Minimal);
settings.WithProperty("iOSRoslynPathHackRequired", "true");
settings.WithProperty("PackageVersion", data.Version);
settings.UseToolVersion(MSBuildToolVersion.VS2017);
settings.WithRestore();
});
@@ -211,6 +219,13 @@ void DotNetCorePack(Parameters parameters)
var settings = new DotNetCorePackSettings
{
Configuration = parameters.Configuration,
MSBuildSettings = new DotNetCoreMSBuildSettings
{
Properties =
{
{ "PackageVersion", new [] { parameters.Version } }
}
}
};
DotNetCorePack(parameters.MSBuildSolution, settings);
@@ -225,6 +240,7 @@ Task("Create-NuGet-Packages-Impl")
settings.SetConfiguration(data.Configuration);
settings.SetVerbosity(Verbosity.Minimal);
settings.WithProperty("iOSRoslynPathHackRequired", "true");
settings.WithProperty("PackageVersion", data.Version);
settings.UseToolVersion(MSBuildToolVersion.VS2017);
settings.WithRestore();
settings.WithTarget("Pack");
-9
View File
@@ -23,13 +23,4 @@
<ItemGroup>
<PackageReference Include="SlnGen" Version="2.0.40" PrivateAssets="all" />
</ItemGroup>
<Target Name="Pack" DependsOnTargets="PrepareProjectReferences">
<MSBuild Projects="@(_MSBuildProjectReferenceExistent)"
Targets="Pack"
Properties="$(TraversalGlobalProperties);$(TraversalBuildGlobalProperties)"
BuildInParallel="$(BuildInParallel)"
SkipNonexistentProjects="$(SkipNonexistentProjects)"
SkipNonexistentTargets="$(SkipNonexistentTargets)" />
</Target>
</Project>
+1 -1
View File
@@ -1,6 +1,6 @@
{
"msbuild-sdks": {
"Microsoft.Build.Traversal": "1.0.41",
"Microsoft.Build.Traversal": "1.0.43",
"MSBuild.Sdk.Extras": "1.6.46",
"AggregatePackage.NuGet.Sdk" : "0.1.12"
}