updates for boost 1.79.0

sergey-shandar · Apr 15, 2022 · c184ea3 · c184ea3
1 parent 3b2d7cf
commit c184ea3
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 20 deletions.
diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml
@@ -11,8 +11,8 @@ jobs:
       matrix:
         build_configuration: [Release]
         build_platform: [Any CPU]
-        build_boost_version: [1_72_0]
-        build_boost_version_dot: [1.72.0]
+        build_boost_version: [1_79_0]
+        build_boost_version_dot: [1.79.0]
         build_msvc_version_dot: [14.2, 14.1]
     steps:
     - name: Checkout repo
@@ -40,12 +40,12 @@ jobs:
       working-directory: .
       run: |
           Set-Location -Path 'D:\a'
-          New-Item -ItemType directory -Path D:\a\boost
-          Set-Location -Path 'D:\a\boost'
-          (New-Object System.Net.WebClient).DownloadFile("https://dl.bintray.com/boostorg/release/${{ matrix.build_boost_version_dot }}/binaries/boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe", "D:\a\boost\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe")
-          (New-Object System.Net.WebClient).DownloadFile("https://dl.bintray.com/boostorg/release/${{ matrix.build_boost_version_dot }}/binaries/boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe", "D:\a\boost\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe")
-          .\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe /SILENT /DIR=D:\a\boost\boost | Out-Null
-          .\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe /SILENT /DIR=D:\a\boost\boost | Out-Null
+          New-Item -ItemType directory -Path D:\a\boostorg
+          Set-Location -Path 'D:\a\boostorg'
+          (New-Object System.Net.WebClient).DownloadFile("https://boostorg.jfrog.io/artifactory/main/release/${{ matrix.build_boost_version_dot }}/binaries/boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe", "D:\a\boostorg\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe")
+          (New-Object System.Net.WebClient).DownloadFile("https://boostorg.jfrog.io/artifactory/main/release/${{ matrix.build_boost_version_dot }}/binaries/boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe", "D:\a\boostorg\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe")
+          .\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe /SILENT /DIR=D:\a\boostorg\boost | Out-Null
+          .\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe /SILENT /DIR=D:\a\boostorg\boost | Out-Null
 
     - name: run builder
       working-directory: builder\builder\bin\Release\

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,13 +1,13 @@
-version: 1.78.{build}
+version: 1.79.{build}
 
 
 environment:
   matrix:
 
   - PlatformToolset: v143
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-    BUILD_BOOST_VERSION: 1_78_0
-    BUILD_BOOST_VERSION_DOT: 1.78.0
+    BUILD_BOOST_VERSION: 1_79_0
+    BUILD_BOOST_VERSION_DOT: 1.79.0
     BUILD_MSVC_VERSION_DOT: 14.2
 
 configuration:

diff --git a/builder/builder/Config.cs b/builder/builder/Config.cs
@@ -6,7 +6,7 @@ namespace builder
     public static class Config
     {
         public static readonly Version Version = 
-            new StableVersion(1, 78, 0);
+            new StableVersion(1, 79, 0);
 
         public static readonly List[] Release =
         {
@@ -40,9 +40,9 @@ public CompilerInfo(string name, string preRelease = "")
             { "vc110", new CompilerInfo("Visual Studio 2012 Update 4") },
             { "vc120", new CompilerInfo("Visual Studio 2013 Update 5") },
             { "vc140", new CompilerInfo("Visual Studio 2015 Update 3") },
-            { "vc141", new CompilerInfo("Visual Studio 2017 15.9.41") },
-            { "vc142", new CompilerInfo("Visual Studio 2019 16.11.7") },
-            { "vc143", new CompilerInfo("Visual Studio 2022 17.0.2") },
+            { "vc141", new CompilerInfo("Visual Studio 2017 15.9.45") },
+            { "vc142", new CompilerInfo("Visual Studio 2019 16.11.11") },
+            { "vc143", new CompilerInfo("Visual Studio 2022 17.1.1") },
         };
 
         public static int CompilerNumber(string key)

diff --git a/builder/builder/Nuspec.cs b/builder/builder/Nuspec.cs
@@ -63,7 +63,8 @@ private static void CreateNuspec(
                         N("version", version.ToString()),
                         N("authors", Config.Authors),
                         N("owners", Config.Owners),
-                        N("licenseUrl", "https://github.com/sergey-shandar/getboost/blob/master/LICENSE"),
+                        N("license", Xml.A("type", "expression")),
+                        N("license", "BSL-1.0"),
                         N("projectUrl", "https://github.com/sergey-shandar/getboost"),
                         N("requireLicenseAcceptance", "false"),
                         N("description", description),
@@ -85,7 +86,7 @@ private static void CreateNuspec(
             nuspec.CreateDocument().Save(nuspecFile);
             Process.Start(
                 new ProcessStartInfo(
-                    @"..\..\..\packages\NuGet.CommandLine.6.0.0\tools\nuget.exe", 
+                    @"..\..\..\packages\NuGet.CommandLine.6.1.0\tools\nuget.exe", 
                     "pack " + nuspecFile)
                 {
                     UseShellExecute = false,
@@ -95,14 +96,14 @@ private static void CreateNuspec(
             {
                 var p = Process.Start(
                   new ProcessStartInfo(
-                      @"..\..\..\packages\NuGet.CommandLine.6.0.0\tools\nuget.exe",
+                      @"..\..\..\packages\NuGet.CommandLine.6.1.0\tools\nuget.exe",
                       "push " + nupkgFile + " -Source https://api.nuget.org/v3/index.json -ApiKey _")
                   {
                       UseShellExecute = false,
                   });
                 p.WaitForExit();
                 if (p.ExitCode != 0) {
-                    Environment.Exit(p.ExitCode);
+                    //Environment.Exit(p.ExitCode);
                 }
             }
         }

diff --git a/builder/builder/packages.config b/builder/builder/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Framework.G1" version="1.0.13.0" targetFramework="net45" userInstalled="true" />
-  <package id="NuGet.CommandLine" version="6.0.0" targetFramework="net48" userInstalled="true" developmentDependency="true" />
+  <package id="NuGet.CommandLine" version="6.1.0" targetFramework="net48" userInstalled="true" developmentDependency="true" />
 </packages>
diff --git a/builder/builderTest/builderTest.csproj b/builder/builderTest/builderTest.csproj
@@ -40,7 +40,16 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Framework.G1.1.0.13.0\lib\portable-net45+sl50+win+wp80+MonoAndroid10+MonoTouch10\Framework.G1.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.ComponentModel.Composition.Registration" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">

diff --git a/builder/builderTest/packages.config b/builder/builderTest/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Framework.G1" version="1.0.13.0" targetFramework="net451" />
+  <package id="NuGet.CommandLine" version="5.11.0" targetFramework="net48" developmentDependency="true" />
 </packages>