Skip to content

Commit 7fb7975

Browse files
ivo-stoilovivo-stoilov
authored
Merge pull request #192 from telerik/R1.2023
Merge R1.2023
2 parents f0f6cc6 + 555f6aa commit 7fb7975

File tree

92 files changed

+96
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+96
-93
lines changed

‎Build/Config.targets‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<Project>
22
<PropertyGroup Condition="'$(DevEnvDir)' == '' ">
3-
<DevEnvDir>C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\</DevEnvDir>
3+
<VSProfessional>C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\</VSProfessional>
4+
<VSEnterprise>C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\</VSEnterprise>
5+
<DevEnvDir Condition="Exists('$(VSProfessional)') == 'true'">$(VSProfessional)</DevEnvDir>
6+
<DevEnvDir Condition="'$(DevEnvDir)' == '' ">$(VSEnterprise)</DevEnvDir>
47
</PropertyGroup>
58
</Project>

‎Examples/CSExamples/JustMock.NonElevatedExamples.VS2017/AdvancedUsage/ConcreteMocking.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
JustMock Lite
3-
Copyright © 2010-2014 Telerik EAD
3+
Copyright © 2010-2023 Progress Software Corporation
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎Examples/CSExamples/JustMock.NonElevatedExamples.VS2017/AdvancedUsage/MockingDelegates.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
JustMock Lite
3-
Copyright © 2010-2014 Telerik EAD
3+
Copyright © 2010-2023 Progress Software Corporation
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎Examples/CSExamples/JustMock.NonElevatedExamples.VS2017/AdvancedUsage/PrivateAccessor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
JustMock Lite
3-
Copyright © 2010-2014 Telerik EAD
3+
Copyright © 2010-2023 Progress Software Corporation
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎Examples/CSExamples/JustMock.NonElevatedExamples.VS2017/BasicUsage/AssertingOccurrence.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
JustMock Lite
3-
Copyright © 2010-2014 Telerik EAD
3+
Copyright © 2010-2023 Progress Software Corporation
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎Examples/CSExamples/JustMock.NonElevatedExamples.VS2017/BasicUsage/Automocking.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
JustMock Lite
3-
Copyright © 2010-2014 Telerik EAD
3+
Copyright © 2010-2023 Progress Software Corporation
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎Examples/CSExamples/JustMock.NonElevatedExamples.VS2017/BasicUsage/CreateMocksByExample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
JustMock Lite
3-
Copyright © 2010-2014 Telerik EAD
3+
Copyright © 2010-2023 Progress Software Corporation
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎Examples/CSExamples/JustMock.NonElevatedExamples.VS2017/BasicUsage/FluentMocking.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
JustMock Lite
3-
Copyright © 2010-2014 Telerik EAD
3+
Copyright © 2010-2023 Progress Software Corporation
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎Examples/CSExamples/JustMock.NonElevatedExamples.VS2017/BasicUsage/Generics.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
JustMock Lite
3-
Copyright © 2010-2014 Telerik EAD
3+
Copyright © 2010-2023 Progress Software Corporation
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎Examples/CSExamples/JustMock.NonElevatedExamples.VS2017/BasicUsage/Matchers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
JustMock Lite
3-
Copyright © 2010-2014 Telerik EAD
3+
Copyright © 2010-2023 Progress Software Corporation
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)