diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af4e8e07..8e2a48b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ on: jobs: build_windows: - runs-on: windows-2019 - name: "Windows 2019 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}" + runs-on: windows-2022 + name: "Windows 2022 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}" strategy: matrix: arch: ["x86", "amd64"] diff --git a/conan/profiles/vs32 b/conan/profiles/vs32 index f78b6c43..40e4f802 100644 --- a/conan/profiles/vs32 +++ b/conan/profiles/vs32 @@ -7,4 +7,5 @@ arch=x86 compiler.runtime=static compiler.runtime_type=Release build_type=Release +compiler.version=194 diff --git a/conan/profiles/vs32debug b/conan/profiles/vs32debug index 44563790..61a7bec6 100644 --- a/conan/profiles/vs32debug +++ b/conan/profiles/vs32debug @@ -7,3 +7,4 @@ arch=x86 compiler.runtime=static compiler.runtime_type=Debug build_type=Debug +compiler.version=194 diff --git a/conan/profiles/vs32shared b/conan/profiles/vs32shared index cac3622e..d573daba 100644 --- a/conan/profiles/vs32shared +++ b/conan/profiles/vs32shared @@ -7,6 +7,7 @@ arch=x86 compiler.runtime=dynamic compiler.runtime_type=Release build_type=Release +compiler.version=194 [options] shared=True diff --git a/conan/profiles/vs64 b/conan/profiles/vs64 index b383dfae..4e1e91c4 100644 --- a/conan/profiles/vs64 +++ b/conan/profiles/vs64 @@ -6,4 +6,5 @@ compiler.cppstd=17 arch=x86_64 compiler.runtime=static compiler.runtime_type=Release -build_type=Release \ No newline at end of file +build_type=Release +compiler.version=194 diff --git a/conan/profiles/vs64debug b/conan/profiles/vs64debug index e72e4f7f..2a0cec25 100644 --- a/conan/profiles/vs64debug +++ b/conan/profiles/vs64debug @@ -7,4 +7,4 @@ arch=x86_64 compiler.runtime=static compiler.runtime_type=Debug build_type=Debug - +compiler.version=194 diff --git a/conan/profiles/vs64shared b/conan/profiles/vs64shared index ebea4cd9..3ddb5bd3 100644 --- a/conan/profiles/vs64shared +++ b/conan/profiles/vs64shared @@ -7,6 +7,7 @@ arch=x86_64 compiler.runtime=dynamic compiler.runtime_type=Release build_type=Release +compiler.version=194 [options] shared=True diff --git a/src/mtconnect/agent.cpp b/src/mtconnect/agent.cpp index e2406a62..d350f92c 100644 --- a/src/mtconnect/agent.cpp +++ b/src/mtconnect/agent.cpp @@ -909,9 +909,6 @@ namespace mtconnect { { NAMED_SCOPE("Agent::initializeDataItems"); - // Grab data from configuration - string time = getCurrentTime(GMT_UV_SEC); - // Initialize the id mapping for the devices and set all data items to UNAVAILABLE for (auto item : device->getDeviceDataItems()) {